From d2f5964f2286f45a3dd9a8b05d325b29d9a0a8ab Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 一月 2024 14:30:10 +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 |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 a436ccd..0507bd1 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
@@ -5,6 +5,11 @@
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public enum Org {
 
     Ym("ym", "鍏冭皨"),
@@ -17,6 +22,17 @@
     Org(String tag, String name){
         this.tag = tag ;
         this.name = name ;
+    }
+    //鐢ㄦ潵杞琷son
+    public static List<Map> OrgList = new ArrayList<>();
+    static {
+        Org[] all = Org.values();
+        for (Org one : all) {
+            Map<String, String> objMap = new HashMap<>();
+            objMap.put("tag", one.tag);
+            objMap.put("name", one.name);
+            OrgList.add(objMap) ;
+        }
     }
 
     public String getTag() {
@@ -35,8 +51,10 @@
         }
         return null ;
     }
+
+
     @JSONField
-    JSONObject toJson() {
+    public JSONObject toJson() {
         return JSONObject.of("tag", getTag(), "name", getName());
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0