From 915221c09726c4105ecadd58aed1ea1cc860d504 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 07 六月 2024 14:06:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 0507bd1..f5870de 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
@@ -13,7 +13,8 @@
public enum Org {
Ym("ym", "鍏冭皨"),
- Pj("pj", "鐗囪闀�") ;
+ Pj("pj", "鐗囪闀�"),
+ Jyg("ym", "鍢夊唱鍏�");
@EnumValue
public String tag ;
@@ -44,7 +45,7 @@
}
public static Org get(String tag){
- if(tag.equals(Ym.tag)){
+ if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
return Ym ;
}else if(tag.equals(Pj.tag)){
return Pj ;
--
Gitblit v1.8.0