Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
This commit is contained in:
commit
bb69aa45bd
|
@ -102,7 +102,6 @@ class Group_user(models.Model):
|
||||||
User, on_delete=models.CASCADE, null=True, blank=True)
|
User, on_delete=models.CASCADE, null=True, blank=True)
|
||||||
group = models.ForeignKey(
|
group = models.ForeignKey(
|
||||||
Group, on_delete=models.CASCADE, null=True, blank=True)
|
Group, on_delete=models.CASCADE, null=True, blank=True)
|
||||||
status = models.IntegerField('状态', default=1)
|
|
||||||
created = models.DateTimeField('创建时间', auto_now_add=True)
|
created = models.DateTimeField('创建时间', auto_now_add=True)
|
||||||
updated = models.DateTimeField('更新时间', auto_now=True)
|
updated = models.DateTimeField('更新时间', auto_now=True)
|
||||||
|
|
||||||
|
@ -741,19 +740,17 @@ class TimelinessMonitoring(models.Model):
|
||||||
counties = models.CharField('县区',max_length=256,null=True,blank=True)
|
counties = models.CharField('县区',max_length=256,null=True,blank=True)
|
||||||
remark = models.CharField('备注',max_length=256,null=True,blank=True)
|
remark = models.CharField('备注',max_length=256,null=True,blank=True)
|
||||||
results = models.CharField('监测结果',max_length=256,null=True,blank=True)
|
results = models.CharField('监测结果',max_length=256,null=True,blank=True)
|
||||||
update = models.IntegerField('更新次数', null=True, blank=True)
|
update = models.CharField('更新次数',max_length=256,null=True,blank=True)
|
||||||
silet = models.IntegerField(
|
silet = models.CharField('最大连续静默日数',max_length=256,null= True,blank=True)
|
||||||
'最大连续静默日数', max_length=256, null=True, blank=True)
|
start_data = models.CharField('开始时间',max_length=256,null=True,blank=True)
|
||||||
start_data = models.CharField(
|
|
||||||
'开始时间', max_length=256, null=True, blank=True)
|
|
||||||
end_data = models.CharField('结束时间',max_length=256,null=True,blank=True)
|
end_data = models.CharField('结束时间',max_length=256,null=True,blank=True)
|
||||||
comment = models.IntegerField(
|
comment = models.CharField('评论次数',max_length=256,null=True,blank=True)
|
||||||
'评论次数', null=True, blank=True)
|
|
||||||
date = models.CharField('最近更新时间',max_length=256,null=True,blank=True)
|
date = models.CharField('最近更新时间',max_length=256,null=True,blank=True)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.n_name
|
return self.n_name
|
||||||
|
|
||||||
|
|
||||||
# 错别字临时表
|
# 错别字临时表
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue