Merge remote-tracking branch 'origin/master'

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockCountDay/mapper/xml/InterlockCountDayMapper.xml

@@ -28,14 +28,14 @@
         select loop_health_level as level,count(*) as number,TO_CHAR(tag_time::timestamp, 'YYYY-MM-DD') as time
         from interlock_summary
         where interlock_apparatus_id = #{deviceId} and interlock_system_id = #{systemId} and loop_health_level != ''
-        group by loop_health_level,tag_time
+        group by loop_health_level,TO_CHAR(tag_time::timestamp, 'YYYY-MM-DD')
     </select>
 
     <select id="getCurronInterlockStatus" resultType="org.jeecg.modules.dashboardInterface.entity.InterlockAndYbStatus">
         select interlock_status as statusName,count(*) as number,TO_CHAR(tag_time::timestamp, 'YYYY-MM-DD') as time
         from interlock_summary
         where interlock_apparatus_id = #{deviceId} and interlock_system_id = #{systemId} and interlock_status != ''
-        group by interlock_status,tag_time
+        group by interlock_status,TO_CHAR(tag_time::timestamp, 'YYYY-MM-DD')
     </select>
 
     <select id="getSummaryList" resultType="org.jeecg.modules.summary.entity.InterlockSummary">