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

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

@@ -106,7 +106,7 @@
     </select>
 
     <select id="getYsEndTime" resultType="java.util.Map">
-        SELECT SEQUENCE_NBR as sequenceNbr,rec_date AS time
+        SELECT SEQUENCE_NBR as sequenceNbr,acceptance_time AS time
         FROM hygf_acceptance_check
         WHERE acceptance_check_status='3'
     </select>

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

@@ -4,7 +4,7 @@
 
 
     <select id="getBwEndTime" resultType="java.util.Map">
-        SELECT SEQUENCE_NBR AS sequenceNbr,rec_date as time
+        SELECT SEQUENCE_NBR AS sequenceNbr,grid_time as time
         FROM hygf_basic_grid_record
         WHERE grid_status='3'
     </select>