Merge remote-tracking branch 'origin/develop' into release_temp

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql

@@ -1,5 +1,7 @@
-alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0';
+alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 1 COMMENT '是否手动结束 手动:1，定时任务传参:0' AFTER `STATUS`;
+
 
 UPDATE staff_patrol_record
-SET is_hand_end  = 1
+SET is_hand_end  = 0
-WHERE ID IN (SELECT ID FROM staff_patrol_record WHERE ACTRUAL_END_TIME NOT LIKE '%23:59:59');
+WHERE ID IN (SELECT ID FROM (SELECT ID FROM staff_patrol_record WHERE CONVERT(ACTRUAL_END_TIME,char) LIKE '%23:59:59') temp);
+