Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -72,11 +72,11 @@
             and hygf_work_order.sequence_nbr = #{dto.workOrderId}
         </if>
         <if test=' dto.type!=null and dto.type == "1"'>
-            and  hygf_work_order_power_station.power_station_construction_status in ("待登记","未通过","已完工","待审核")
+            and  hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工','待审核')
         </if>
 
         <if test=' dto.type !=null and dto.type == "2"'>
-            and  hygf_work_order_power_station.power_station_construction_status in ("未通过","已完工","待审核")
+            and  hygf_work_order_power_station.power_station_construction_status in ('未通过','已完工','待审核')
         </if>
 
         <if test="dto.projectAddressName!=null and dto.projectAddressName!=''">

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -108,8 +108,8 @@
     <select id="queryWarningList" resultType="java.util.Map">
         SELECT
         log.SEQUENCE_NBR,
-        log.CREATE_DATE AS CREATE_DATE,
-        log.REC_DATE AS REC_DATE,
+        DATE_FORMAT(log.CREATE_DATE, '%Y-%m-%d %H:%i:%s') AS CREATE_DATE,
+        DATE_FORMAT(log.REC_DATE, '%Y-%m-%d %H:%i:%s') AS REC_DATE,
         log.EVENT_LEVEL_DESC,
         log.EVENT_LEVEL,
         log.SOURCE_ATTRIBUTION_DESC,