From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
index f8418cd..78a3799 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
@@ -10,15 +10,28 @@
 
     @ApiModelProperty(value = "鍛樺伐鍚嶇О")
     private String name;
+    @ApiModelProperty(value = "娲鹃仯鍠綅鍚嶇О")
+    private String duName;
 
     @ApiModelProperty(value = "韬唤璇佸彿鐮�")
     private String idCard;
 
+    @ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
+    private Integer duId;
+
+    @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
+    private Integer solutionsId;
+
+    @ApiModelProperty(value = "淇濋櫓鐘舵��:0=鍏ㄩ儴;1=淇濋殰涓�;2=涓嶅湪淇�")
+    private Integer solutionsStatus;
 
     @ApiModelProperty(value = "闇�杩囨护鏁版嵁闆嗗悎")
     private List<Integer> memberIds;
 
-    @ApiModelProperty(value = "杩囨护淇濆崟涓婚敭涓嬫暟鎹�")
+    @ApiModelProperty(value = "杩囨护淇濆崟涓婚敭涓嬫暟鎹�" ,notes = "鍔犱繚鐢宠")
+    private Integer notInInsuranceApplyId;
+
+    @ApiModelProperty(value = "淇濆崟涓婚敭涓嬫暟鎹�" , notes = "鍑忎繚鐢宠/鎹㈠巶鐢宠")
     private Integer insuranceApplyId;
 
     @ApiModelProperty(value = "浼佷笟涓婚敭")

--
Gitblit v1.9.3