Skip to content

Y
YeeAmosFireAutoSysRoot
Commit ac4538f8 authored by maoying's avatar maoying
Browse files
Options

修改冲突

parent 1f6e5ee9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 9 deletions
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml
View file @ ac4538f8
...@@ -71,20 +71,12 @@ ...@@ -71,20 +71,12 @@
, cpd.edition , cpd.edition
, cpd.implementation_time implementationTime , cpd.implementation_time implementationTime
, cpd.remark , cpd.remark
<<<<<<< HEAD
, status
, sec_status
, creator
, reviser
, update_time updateTime
, org_code orgCode
=======
, cpd.status , cpd.status
, cpd.sec_status
, cpd.creator , cpd.creator
, cpd.reviser , cpd.reviser
, cpd.update_time updateTime , cpd.update_time updateTime
, cpd.org_code orgCode , cpd.org_code orgCode
>>>>>>> a2e8b014fb000a9d8d31d5aeef64cdccbc0c46b3
, cpd.is_delete isDelete , cpd.is_delete isDelete
, cpd.input_time inputTime , cpd.input_time inputTime
, (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment