解决冲突

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/EquimentEnum.java

@@ -14,15 +14,15 @@ public enum EquimentEnum {
      *
      */
 
-    XINZENG("新增",0),
+    WEIDENGJI("未登记",0),
     ZAIYONG("在用",1),
     TINGYONG("停用",2),
     BAOFEI("报废",3),
-    ZHUXIAO("注销",4),
-    QIANCHU("迁出",5),
-    CHAICHU("拆除",6),
-    MULUWAI("目录外",7),
-    FEIFASHEBEI("非法设备",8);
+    ZHUXIAO("注销",4);
+//    QIANCHU("迁出",5),
+//    CHAICHU("拆除",6),
+//    MULUWAI("目录外",7),
+//    FEIFASHEBEI("非法设备",8);
     String name;
     Integer code;