From 8d2b573ced32e6ca6fab7c1dc45e1fa108030ba1 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 28 八月 2024 17:21:23 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java index a36cae3..1cca228 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java @@ -31,22 +31,22 @@ * 鏉慖D */ @Schema(description = "鎵�鍦ㄦ潙ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "鎵�鍦ㄦ潙涓嶈兘涓虹┖") - private Long villageid; + //@NotNull(message = "鎵�鍦ㄦ潙涓嶈兘涓虹┖") + private Long villageId; /** * 鐗囧尯ID */ @Schema(description = "鎵�鍦ㄧ墖鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�") - private Long blockid; + //@NotNull(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�") + private Long blockId; /** * 鍒嗘按鎴縄D */ @Schema(description = "鎵�鍦ㄥ垎姘存埧ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "鎵�鍦ㄥ垎姘存埧涓嶈兘涓虹┖") - private Long divideid; + //@NotNull(message = "鎵�鍦ㄥ垎姘存埧涓嶈兘涓虹┖") + private Long divideId; /** * 鍐滄埛濮撳悕 @@ -68,9 +68,9 @@ * 韬唤璇佸彿 */ @Schema(description = "鍐滄埛韬唤璇佸彿", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "鍐滄埛韬唤璇佸彿涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null - @Length(message = "鍐滄埛韬唤璇佸彿蹇呴』{max}浣嶆暟鎹�", min = 18, max = 18) - private String idcard; + //@NotBlank(message = "鍐滄埛韬唤璇佸彿涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null + //@Length(message = "鍐滄埛韬唤璇佸彿蹇呴』{max}浣嶆暟鎹�", min = 18, max = 18) + private String idCard; /** * 绉嶆闈㈢Н @@ -82,20 +82,20 @@ * 鐢ㄦ按鏂瑰紡 */ @Schema(description = "鐢ㄦ按鏂瑰紡", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private Long typeid; + private Long typeId; /** * 琛楅亾鍙婇棬鐗屽彿 */ @Schema(description = "琛楅亾+闂ㄧ墝鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Length(message = "鍦板潃涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50) + @Length(message = "鍦板潃涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", max = 50) private String address; /** * 澶囨敞淇℃伅 */ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 200) + @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", max = 200) private String remarks; /** -- Gitblit v1.8.0