From 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Dec 2023 19:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/PlantLayoutTypeEnum.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/PlantLayoutTypeEnum.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/PlantLayoutTypeEnum.java
index 3e00997..7acc61e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/PlantLayoutTypeEnum.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/PlantLayoutTypeEnum.java
@@ -32,28 +32,28 @@
* }
*/
- FANG_HONG(1,"坝后式"),
+ FANG_HONG("1","坝后式"),
- GUAN_GAI(2,"坝内式"),
+ GUAN_GAI("2","坝内式"),
- GONG_SHUI(3,"地下式"),
+ GONG_SHUI("3","地下式"),
- FA_DIAN(4,"河床式"),
+ FA_DIAN("4","河床式"),
- HANG_YUN(5,"引水式"),
- QI_TA(10,"其他"),
+ HANG_YUN("5","引水式"),
+ QI_TA("10","其他"),
- NULL_ABLE(-1,"");
+ NULL_ABLE("-1","");
- int key;
+ String key;
String label;
- PlantLayoutTypeEnum(int key,String label) {
+ PlantLayoutTypeEnum(String key,String label) {
this.key = key;
this.label = label;
}
- public static PlantLayoutTypeEnum find(int key) {
+ public static PlantLayoutTypeEnum find(String key) {
return Arrays.stream(values()).filter(resFucEnum -> resFucEnum.key == key).findAny().orElse(NULL_ABLE);
}
--
Gitblit v1.9.3