From b6d93e08adb11e7f4584173d9d44dbc7c7508e9f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 17:50:23 +0800
Subject: [PATCH] 测试冲突
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 4b344a6..4ee99ec 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,17 +1,33 @@
package com.dy.pipIrrGlobal.util;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import java.util.HashMap;
+import java.util.Map;
+
public enum Org {
Ym("ym", "鍏冭皨"),
Pj("pj", "鐗囪闀�") ;
+ @EnumValue
public String tag ;
public String name ;
Org(String tag, String name){
this.tag = tag ;
this.name = name ;
+ }
+ //鐢ㄦ潵杞琷son
+ public static Map<String, Org> ObjMap = new HashMap<String, Org>();
+ static {
+ Org[] all = Org.values();
+ for (Org one : all) {
+ ObjMap.put(one.tag, one);
+ }
}
public String getTag() {
@@ -30,4 +46,10 @@
}
return null ;
}
+
+
+ @JSONField
+ public JSONObject toJson() {
+ return JSONObject.of("tag", getTag(), "name", getName());
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0