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

apps/Equipment/views.py

@@ -1874,7 +1874,7 @@ class Sightsee_Check_List(ListView):
         # req = request.POST.get('req')
         i = Sightsee_Info.objects.get(id=s_id)
         data = {"name":i.name,"price":i.price,"desc":i.desc,"location":i.location,"addr":i.addr,"sightsee_stime":i.sightsee_stime,"sightsee_etime":i.sightsee_etime,
-                "sightsee_img":i.sightsee_img,"sightsee_tel":i.sightsee_tel,"upl_time":i.upl_time,"guide_img":i.guide_img,"content":i.content}
+                "sightsee_img":i.sightsee_img,"sightsee_tel":i.sightsee_tel,"upl_time":i.upl_time.strftime('%Y-%m-%d %H:%M:%S'),"guide_img":i.guide_img,"content":i.content}
         data = json.dumps(data,ensure_ascii=False)
         return HttpResponse(data)