From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
index 51f8bd6..dcfa310 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
@@ -42,6 +42,7 @@
* 涓婄骇琛屼笅鍖篒D
*/
@Schema(description = "涓婄骇瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long supperId;
/**
@@ -82,4 +83,15 @@
@TableField(exist = false)
public List<BaDistrict> subDistricts ;
+ /**
+ * 涓嬬骇琛屾斂鍖洪泦鍚�
+ */
+ @Schema(description = "鏄惁鍙互娣讳笅绾э紝琛ㄥ崟涓嶇敤濉啓锛屽彧鍦ㄦ煡璇㈠垪琛ㄦ椂鏈夋晥", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public boolean canAdd ;
+
+ @Schema(description = "鏄惁鍙互鍒犻櫎锛岃〃鍗曚笉鐢ㄥ～鍐欙紝鍙湪鏌ヨ鍒楄〃鏃舵湁鏁�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public boolean canDelete ;
+
}
\ No newline at end of file
--
Gitblit v1.8.0