2 Incheckningar 87ce595e4b ... 0cafdabc3a

Upphovsman SHA1 Meddelande Datum
  丁治程 0cafdabc3a Merge remote-tracking branch 'origin/master' 7 månader sedan
  丁治程 9448e0f2ce 日统计逻辑更改 7 månader sedan

+ 1 - 1
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockSummaryHistoryMapper.xml

@@ -332,7 +332,7 @@
 
     <select id="getCurrentDaySummaryInterlock" resultType="org.jeecg.modules.interlockSummaryDay.entity.InterlockSummaryDay">
         select interlock_name,interlock_system_id,interlock_apparatus_id,interlock_status,loop_health_level,
-               ljgxinterlock_out_value,device_id,module_name,interlock_out_value_tag,create_by,create_time,
+               ljgx,interlock_out_value,device_id,module_name,interlock_out_value_tag,create_by,create_time,
                update_by,update_time,remark,sys_org_code,tag_time,interlock_status_ps,interlock_status_name
         from interlock_summary
     </select>