From e706b848e0a32628e869b312bb5d1557d0030dcc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 10 七月 2024 18:07:31 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
index f5870de..fa3fdc0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
@@ -12,8 +12,9 @@
public enum Org {
- Ym("ym", "鍏冭皨"),
- Pj("pj", "鐗囪闀�"),
+// Ym("ym", "鍏冭皨"),
+// Pj("pj", "鐗囪闀�"),
+ Sp("sp", "娌欑洏"),
Jyg("ym", "鍢夊唱鍏�");
@EnumValue
@@ -45,10 +46,15 @@
}
public static Org get(String tag){
- if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
- return Ym ;
- }else if(tag.equals(Pj.tag)){
- return Pj ;
+// if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
+// return Ym ;
+// }else if(tag.equals(Pj.tag)){
+// return Pj ;
+// }
+ if(tag.equals(Jyg.tag)){
+ return Jyg ;
+ }else if(tag.equals(Sp.tag)) {
+ return Sp;
}
return null ;
}
--
Gitblit v1.8.0