From 0cbb588628da7bcdca146420a672916a76df2e0c Mon Sep 17 00:00:00 2001
From: niying <132>
Date: 星期一, 29 一月 2024 11:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java b/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
index 9a2fd49..8de44ba 100644
--- a/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
+++ b/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
@@ -10,10 +10,17 @@
/**
* 灞�鍩熺墿鏂欏悕绉扮紪鐮�
*/
- MDM_LADGPS_MATERIAL_NAME("灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�","/api/V1/zone/getWLCodes");
+ MDM_LADGPS_MATERIAL_NAME("灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�","/api/V1/zone/getWLCodes"),
+
+
+ /**
+ * 涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇(璁￠噺鍗曚綅)
+ */
+ MDM_UNIT("璁￠噺鍗曚綅涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇","/api/V1/base/getBusinessData","6");
private String name;
private String address;
+ private String type;
/***
* 鏋勯�犲櫒
@@ -23,6 +30,25 @@
MdmEnum(String name, String address) {
this.name = name;
this.address = address;
+ }
+
+ /***
+ * 鏋勯�犲櫒
+ * @param name 鎺ュ彛鍚嶇О
+ * @param address 鎺ュ彛鍦板潃
+ */
+ MdmEnum(String name, String address,String type) {
+ this.name = name;
+ this.address = address;
+ this.type = type;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
}
public String getName() {
@@ -56,7 +82,7 @@
*/
public static MdmEnum getMdmEnumByAddress(String name){
for(MdmEnum mdmEnum : MdmEnum.values()){
- if(mdmEnum.Name() == name){
+ if(mdmEnum.Name().equals(name)){
return mdmEnum;
}
}
--
Gitblit v1.8.0