From 7bce3a96c4a1a61a2c299be033c3fb798648ad78 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 十月 2024 15:05:49 +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/pojoBa/BaBlock.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
index aaf9d1f..95534be 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
@@ -37,14 +37,14 @@
*/
@Schema(description = "鐗囧尯鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "鐗囧尯鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鐗囧尯鍚嶇О灏忎簬{max}瀛�", min = 1, max = 25)
+ @Length(message = "鐗囧尯鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String name;
/**
* 璐熻矗浜�
*/
@Schema(description = "鐗囧尯璐熻矗浜�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "鐗囧尯璐熻矗浜哄鍚嶅皬浜巤max}瀛�", min = 1, max = 25)
+ @Length(message = "鐗囧尯璐熻矗浜哄鍚嶄笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String header;
/**
@@ -66,13 +66,20 @@
* 鐢靛瓙鍦板浘鍖哄煙鐫�鑹�
*/
@Schema(description = "鍖哄煙鐫�鑹�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "鍖哄煙鐫�鑹查暱搴﹀皬浜巤max}瀛�", min = 1, max = 6)
+ @Length(message = "鍖哄煙鐫�鑹查暱搴﹀皬浜巤max}瀛�", min = 0, max = 6)
public String color;
+
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 0, max = 50)
+ public String remark;
/**
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
- @Schema(description = "鐗囧尯鍒犻櫎鏍囧織", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鐗囧尯鍒犻櫎鏍囧織锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Deleted deleted;
}
\ No newline at end of file
--
Gitblit v1.8.0