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/VerSpillwayTypeEnum.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/VerSpillwayTypeEnum.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/VerSpillwayTypeEnum.java
index 047ba29..7d9013f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/VerSpillwayTypeEnum.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/VerSpillwayTypeEnum.java
@@ -26,25 +26,25 @@
* }]
*/
- MLS(1,"漫流式"),
+ MLS("1","漫流式"),
- ZKS(2,"自溃式"),
+ ZKS("2","自溃式"),
- BKYKS(3,"爆破引溃式"),
+ BKYKS("3","爆破引溃式"),
- QI_TA(9,"其他"),
+ QI_TA("9","其他"),
- NULL_ABLE(-1,"");
+ NULL_ABLE("-1","");
- Integer key;
+ String key;
String label;
- VerSpillwayTypeEnum(Integer key, String label) {
+ VerSpillwayTypeEnum(String key, String label) {
this.key = key;
this.label = label;
}
- public static VerSpillwayTypeEnum find(Integer key) {
+ public static VerSpillwayTypeEnum find(String key) {
return Arrays.stream(values()).filter(resFucEnum -> resFucEnum.key==key).findAny().orElse(NULL_ABLE);
}
--
Gitblit v1.9.3