From 52952d6feed8a9df738c652cda6c7d1ca50d2921 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 17:20:23 +0800
Subject: [PATCH] 1、修改rtuAddr注释 2、实现开关阀自报协议 3、实现开阀工作报 4、《编码设计》

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java |    9 +++++++++
 1 files changed, 9 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..ca78397 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,11 +1,16 @@
 package com.dy.pipIrrGlobal.util;
 
 
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
 public enum Org {
 
     Ym("ym", "鍏冭皨"),
     Pj("pj", "鐗囪闀�") ;
 
+    @EnumValue
     public String tag ;
     public String name ;
 
@@ -30,4 +35,8 @@
         }
         return null ;
     }
+    @JSONField
+    public JSONObject toJson() {
+        return JSONObject.of("tag", getTag(), "name", getName());
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0