修改冲突

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -71,20 +71,12 @@
     , cpd.edition
     , cpd.implementation_time implementationTime
     , cpd.remark
-<<<<<<< HEAD
-    , status
-   	, sec_status
-    , creator
-    , reviser
-    , update_time updateTime
-    , org_code orgCode
-=======
     , cpd.status
+    , cpd.sec_status
     , cpd.creator
     , cpd.reviser
     , cpd.update_time updateTime
     , cpd.org_code orgCode
->>>>>>> a2e8b014fb000a9d8d31d5aeef64cdccbc0c46b3
     , cpd.is_delete isDelete
     , cpd.input_time inputTime
     , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName