fix

sop-business/src/main/resources/db/log/shudonghui_update_log.sql

@@ -231,11 +231,7 @@ VALUES
 ---20023.8.24
 ALTER TABLE `t_b_violation`
     ADD COLUMN `code` varchar(200) CHARACTER SET utf8mb4 NOT NULL COMMENT '编号' AFTER `sop_no`;
-<<<<<<< HEAD
-INSERT INTO `sequence` (`name`, `current_value`, `increment`) VALUES ('violationWarn', 0, 1);
-=======
 INSERT INTO `sequence` (`name`, `current_value`, `increment`) VALUES ('violationWarn', 0, 1);
 UPDATE sys_config
 SET org_id=NULL, config_key='sms.violation.remind.code', config_name='违规提醒通知', config_value='SMS_462805303', remark=NULL, enable=1, sort=1, create_id=1, create_time=NULL, update_id=NULL, update_time=NULL
 WHERE id=31;
->>>>>>> fb1c967 (fix)