Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/AppInfo/admin.py

@@ -637,7 +637,7 @@ class FarmUserAdmin(admin.ModelAdmin):
 @admin.register(FarmList)
 class FarmListAdmin(admin.ModelAdmin):
     # 列表页面显示字段
-    list_display = ['name','user','manage_user','garden','area','curr_var','farm_img','upl_time']
+    list_display = ['name','user','manage_user','garden','area','curr_var','farm_img','upl_time','hidden']
     # 搜索项：
     search_fields = ['name']
 

apps/AppInfo/models.py

@@ -447,6 +447,7 @@ class FarmList(models.Model):
     location = models.CharField(u'经纬度', max_length=50, blank=True, null=True)
     farm_desc = models.CharField(u'农场介绍', max_length=50, blank=True,null=True)
     upl_time = models.DateTimeField(u'创建时间', blank=True, null=True)
+    hidden = models.BooleanField(default=False,verbose_name="是否隐藏")
 
     class Meta:
         verbose_name = '农场表'