From 29838e38f40f568df7a0f8572aa17086c3cfe7cc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 09:18:50 +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/pojoPr/PrController.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index 0000ebb..c36da5f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dy.common.po.BaseEntity;
@@ -55,7 +56,6 @@
      */
     @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "鎺у埗鍣ㄥ湴鍧�涓嶈兘涓虹┖")
-    @Length(message = "鎺у埗鍣ㄥ湴鍧�涓嶅ぇ浜巤max}瀛�",max = 11)
     private String rtuAddr;
 
     /**
@@ -63,7 +63,6 @@
      */
     @Schema(description = "閫氳鍗忚", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
-    @Length(message = "閫氳鍗忚涓嶅ぇ浜巤max}瀛�",max = 25)
     private String protocol;
 
     /**
@@ -71,6 +70,12 @@
      */
     @Schema(description = "鍙戠幇鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date findDt;
+    /**
+     * 鏈烘瀯tag
+     */
+    @Schema(description = "鏈烘瀯tag", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "鏈烘瀯tag涓嶈兘涓虹┖")
+    public String orgTag;
 
     /**
      * 娣诲姞鏂瑰紡;1-绯荤粺鑷姩锛�2-鎵嬪姩
@@ -95,4 +100,12 @@
      */
     @Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte deleted;
+
+
+    /////////////////////////////////////////
+    // 闈炴暟鎹簱灞炴��
+    /////////////////////////////////////////
+    @TableField(exist = false)
+    @Schema(description = "鍙栨按鍙g紪鍙�")
+    public String intakeName ;
 }
\ No newline at end of file

--
Gitblit v1.8.0