合并dev分支代码

84608603 · maoying · ada6e397 · 84608603
Commit 84608603 authored May 20, 2020 by maoying
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

dbTemplate_risk_level.xml ...rt/src/main/resources/db/mapper/dbTemplate_risk_level.xml +0 -4

No files found.
--- a/YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_level.xml
+++ b/YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_level.xml
@@ -23,12 +23,8 @@
 		a.severity,
 		a.name,
 		a.color,
-<<<<<<< HEAD
 		a.create_by as createBy,
-=======
 		a.manage_level manageLevel,
-		b.name as userName ,
->>>>>>> dev
 		a.create_date as createDate,
 		a.remark,
 		a.manage_level as manageLevel