Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml

@@ -75,10 +75,10 @@
             AND lo.OPERATOR_MOBILE LIKE concat('%',#{operatorMobile},'%')
         </if>
         <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d%H%i' ) &gt;= #{startTime}
+            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y-%m-%d %H:%i' ) &gt;= #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d%H%i' ) &lt;= #{endTime}
+            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y-%m-%d %H:%i' ) &lt;= #{endTime}
         </if>
         ORDER BY lo.OPERATING_TIME DESC
     </select>