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

apps/Equipment/views.py

@@ -2843,7 +2843,7 @@ class Contrast_List(ListView):
         farm_list = FarmList.objects.filter(garden_id=area_id)
         for i in farm_list:
             for x in Sell_Manage.objects.filter(farm=i):
-                dat.append({"name":x.farm.name,"num":x.num,"area":x.farm.area,"money":x.money,"upl_time":x.upl_time})
+                dat.append({"name":x.farm.name,"num":x.num,"area":x.farm.area,"money":x.money,"upl_time":x.upl_time.strftime('%Y-%m-%d %H:%M:%S')})
         nums = len(dat)
         dat = dat[(10*(page-1)):(page*10)]
         data = json.dumps({"dat":dat,"nums":nums})