Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

apps/enm/tasks.py

@@ -60,7 +60,7 @@ def db_insert_mplogx(limit:bool=True):
         if limit and count > 400:
             raise Exception("db inset count > 400")
         cursor.execute(
-            "select id, val, tag_code, update_time from tag_value where id > %s order by id, update_time", (last_tag_id, ))
+            "select id, val, tag_code, data_time from tag_value where id > %s order by id, data_time", (last_tag_id, ))
         rows = cursor.fetchall()  # 获取数据后保存至本地
         if rows:
             last_tag_id = rows[-1][0]