Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dashboard/models.py

dashboard/models.py

@@ -33,6 +33,7 @@ class Group(models.Model):
         ('0', '区域'),
         ('1', '媒体种类'),
         ('2', '行业'),
+        ('3', '管理')
     )
     id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
     name = models.CharField('矩阵名称', max_length=256, null=True, blank=True)
@@ -82,6 +83,16 @@ class Group_admin(models.Model):
 
 
 class Group_user(models.Model):
+    """
+    status:
+    '0': '已删除',
+    '1': '添加申请市级审核中',
+    '2': '添加申请省级审核中',
+    '3': '正常',
+    '4': '注销申请市级审核中',
+    '5': '注销申请省级审核中',
+    """
+
     id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
     user = models.ForeignKey(
         User, on_delete=models.CASCADE, null=True, blank=True)
@@ -126,7 +137,8 @@ class Organization(models.Model):
     status = models.CharField('状态', max_length=256, null=True, blank=True)
 
     # 20201014新添加字段
-    id_code = models.CharField('单位唯一标识码', max_length=256, null=True, blank=True)
+    id_code = models.CharField(
+        '单位唯一标识码', max_length=256, null=True, blank=True)
 
     created = models.DateTimeField('创建时间', auto_now_add=True)
     updated = models.DateTimeField('更新时间', auto_now=True)
@@ -216,7 +228,8 @@ class NewMedia(models.Model):
     created = models.DateTimeField('创建时间', auto_now_add=True)
     updated = models.DateTimeField('更新时间', auto_now=True)
     # 20201015新增字段
-    identificationcode = models.CharField('新媒体标识码', max_length=256, null=True, blank=True)
+    identificationcode = models.CharField(
+        '新媒体标识码', max_length=256, null=True, blank=True)
     function = models.CharField('功能', max_length=256, null=True, blank=True)
     articleurl = models.TextField('文章URL', null=True, blank=True)
 
@@ -660,7 +673,8 @@ class News(models.Model):
 
 # 手机验证码验证表
 class CheckCode(models.Model):
-    phone_code = models.CharField('手机验证码', max_length=256, null=True, blank=True)
+    phone_code = models.CharField(
+        '手机验证码', max_length=256, null=True, blank=True)
     phone = models.CharField('电话号', max_length=256, null=True, blank=True)
     c_time = models.DateTimeField('时间', auto_now_add=True)
 
@@ -670,34 +684,45 @@ class NewmediaSentimentWeixin(models.Model):
     id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
     code = models.CharField('公众号', max_length=256, null=True, blank=True)
     title = models.CharField('标题', max_length=256, null=True, blank=True)
-    comment_count = models.CharField('评论数',max_length=256,null=True,blank=True)
+    comment_count = models.CharField(
-    reply_count = models.CharField('回复数',max_length=256,null=True,blank=True)
+        '评论数', max_length=256, null=True, blank=True)
+    reply_count = models.CharField(
+        '回复数', max_length=256, null=True, blank=True)
     date = models.CharField('发布时间', max_length=256, null=True, blank=True)
 
     def __str__(self):
         return self.title
 
+
 class NewmediaSentimentWeibo(models.Model):
     id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
     code = models.CharField('微博号', max_length=256, null=True, blank=True)
     title = models.CharField('标题', max_length=256, null=True, blank=True)
-    comment_count = models.CharField('评论数',max_length=256,null=True,blank=True)
+    comment_count = models.CharField(
-    reply_count = models.CharField('回复数',max_length=256,null=True,blank=True)
+        '评论数', max_length=256, null=True, blank=True)
+    reply_count = models.CharField(
+        '回复数', max_length=256, null=True, blank=True)
     date = models.CharField('发布时间', max_length=256, null=True, blank=True)
 
     def __str__(self):
         return self.title
+
+
 class NewmediaSentimentToutiao(models.Model):
     id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
     code = models.CharField('头条号', max_length=256, null=True, blank=True)
     title = models.CharField('标题', max_length=256, null=True, blank=True)
-    comment_count = models.CharField('评论数',max_length=256,null=True,blank=True)
+    comment_count = models.CharField(
-    reply_count = models.CharField('回复数',max_length=256,null=True,blank=True)
+        '评论数', max_length=256, null=True, blank=True)
+    reply_count = models.CharField(
+        '回复数', max_length=256, null=True, blank=True)
     date = models.CharField('发布时间', max_length=256, null=True, blank=True)
 
     def __str__(self):
         return self.title
 # 时效性监测临时表
+
+
 class TimelinessMonitoring(models.Model):
     id = models.UUIDField('id',primary_key=True,default=uuid.uuid4())
     n_type = models.CharField('新媒体类型',max_length=256,null=True,blank=True)
@@ -719,6 +744,8 @@ class TimelinessMonitoring(models.Model):
         return self.n_name
 
 # 错别字临时表
+
+
 class Wrongly(models.Model):
     id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
     error = models.CharField('错误', max_length=256, null=True, blank=True)