From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index b7ef45b..d285e67 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -1,5 +1,6 @@
package com.doumee.dao.admin.request;
+import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -16,7 +17,7 @@
public class MemberQuery implements Serializable {
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
- private String keyWords;
+ private String keyword;
@ApiModelProperty(value = "鏄惁鏈変汉鑴� 0 鍚� 1 鏄�")
private Integer hasFace;
@@ -33,6 +34,10 @@
@ApiModelProperty(value = "濮撳悕")
private String name;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ private Integer isdeleted;
+
@ApiModelProperty(value = "鎵嬫満鍙�")
private String phone;
@@ -42,5 +47,24 @@
@ApiModelProperty(value = "韬唤璇佸彿")
private String idcardNo;
+ @ApiModelProperty(value = " 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ private Integer type;
+
+
+ @ApiModelProperty(value = " 宸ュ彿鍛�")
+ private Integer code;
+
+ @ApiModelProperty(value = "娴峰悍鐘舵�� 0寰呬笅鍙� 1鎴愬姛2澶辫触")
+ private Integer hkStatus;
+
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳 ")
+ private Integer createrId;
+
+
+
+ @ApiModelProperty(value = "erp鏈烘瀯涓婚敭 ")
+ private String erpOrgId;
+ @ApiModelProperty(value = "鏈烘瀯涓婚敭 ")
+ private String companyId;
}
--
Gitblit v1.9.3