解决冲突

0bf50130 · tangwei · 776bddeb · 2299f32c · 0bf50130
Commit 0bf50130 authored May 06, 2023 by tangwei
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

EquimentEnum.java .../yeejoin/amos/boot/module/tzs/api/enums/EquimentEnum.java +6 -6

No files found.
--- a/amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/EquimentEnum.java
+++ b/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),
+    ZHUXIAO("注销",4);
-    QIANCHU("迁出",5),
+//    QIANCHU("迁出",5),
-    CHAICHU("拆除",6),
+//    CHAICHU("拆除",6),
-    MULUWAI("目录外",7),
+//    MULUWAI("目录外",7),
-    FEIFASHEBEI("非法设备",8);
+//    FEIFASHEBEI("非法设备",8);
    String name;
    Integer code;