From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java
index d96c50d..db45b62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java
@@ -9,6 +9,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @author mitao
@@ -34,7 +35,6 @@
     private String phone;
 
     @ApiModelProperty(value = "所属区县")
-    @NotBlank(message = "区县不能空")
     private String districts;
 
     @ApiModelProperty(value = "区县编号")
@@ -42,7 +42,6 @@
     private String districtsCode;
 
     @ApiModelProperty(value = "街道")
-    @NotBlank(message = "街道不能空")
     private String street;
 
     @ApiModelProperty(value = "街道ID")
@@ -50,11 +49,10 @@
     private String streetId;
 
     @ApiModelProperty(value = "社区")
-    @NotBlank(message = "社区不能空")
     private String community;
 
     @ApiModelProperty(value = "社区ID")
-    @NotBlank(message = "社区ID不能空")
+    @NotNull(message = "社区ID不能空")
     private Long communityId;
 
     @ApiModelProperty(value = "服务对象")
@@ -66,4 +64,10 @@
     @ApiModelProperty(value = "头像")
     @NotBlank(message = "头像不能空")
     private String avatar;
+
+    @ApiModelProperty(value = "审核状态 0:待审核 1:审核通过 2:审核不通过")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "拒绝理由")
+    private String refuseReason;
 }

--
Gitblit v1.7.1