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-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java
index 451f3a5..570adb8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoIntakeController.java
@@ -19,24 +19,24 @@
public static final long serialVersionUID = 1L;
/**
- * 鍙栨按鍙ｇ紪鍙�
+ * 鍙栨按鍙D
*/
@Schema(description = "鍙栨按鍙D", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鍙栨按鍙D涓嶈兘涓虹┖")
private Long intakeId;
/**
- * 鎺у埗鍣ㄧ紪鍙�
+ * 锛堟祦娴級鎺у埗鍣↖D
*/
- @Schema(description = "鎺у埗鍣↖D", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎺у埗鍣↖D涓嶈兘涓虹┖")
+ @Schema(description = "缁戝畾鏃朵负娴佹氮鎺у埗鍣↖D/瑙ｇ粦鏃朵负鎺у埗鍣↖D", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "锛堟祦娴級鎺у埗鍣↖D涓嶈兘涓虹┖")
private Long controllerId;
/**
* 澶囨敞淇℃伅
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", max = 200)
private String remarks;
/**
--
Gitblit v1.8.0