修改冲突代码

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3518,7 +3518,7 @@
             ALTER TABLE `cb_data_dictionary` add column `extend` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '扩展列';
         </sql>
     </changeSet>
-    <changeSet author="shg" id="1663051535136-1">
+    <changeSet author="shg" id="1663051595136-1">
         <preConditions onFail="MARK_RAN">
             <not>
                 <tableExists tableName="cb_org_usr_agency_user"/>
@@ -3541,7 +3541,6 @@
             PRIMARY KEY (`sequence_nbr`) USING BTREE,
             UNIQUE KEY `uk_org_usr_id` (`org_usr_id`) USING BTREE
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='单位人员平台人员关系表';
-            >>>>>>> develop_dl_plan6
         </sql>
     </changeSet>
     <changeSet author="tianyiming" id="20220923-tianyiming">