From a43b3f62fa364c3f8c5e3a62ea37cef6faff4af8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 17:41:37 +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 |   56 +++++++++++++++++++++-----------------------------------
 1 files changed, 21 insertions(+), 35 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..5e3341f 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
@@ -1,42 +1,28 @@
 package com.dy.pipIrrGlobal.util;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.EnumValue;
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/24 11:45
+ * @Description
+ */
+public class Org {
+    //鐢ㄦ潵杞琷son
+    public static List<OrgVo> OrgList = new ArrayList<>();
 
-public enum Org {
+    public class OrgVo{
+        public String tag ;
+        public String name ;
 
-    Ym("ym", "鍏冭皨"),
-    Pj("pj", "鐗囪闀�") ;
-
-    @EnumValue
-    public String tag ;
-    public String name ;
-
-    Org(String tag, String name){
-        this.tag = tag ;
-        this.name = name ;
-    }
-
-    public String getTag() {
-        return this.tag ;
-    }
-
-    public String getName() {
-        return this.name ;
-    }
-
-    public static Org get(String tag){
-        if(tag.equals(Ym.tag)){
-            return Ym ;
-        }else if(tag.equals(Pj.tag)){
-            return Pj ;
+        public String getTag() {
+            return this.tag ;
         }
-        return null ;
+
+        public String getName() {
+            return this.name ;
+        }
     }
-    @JSONField
-    JSONObject toJson() {
-        return JSONObject.of("tag", getTag(), "name", getName());
-    }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0