From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 16:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index 07a55a1..82979e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -1,9 +1,8 @@
package com.doumee.dao.admin.request;
-import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
import lombok.Data;
import java.io.Serializable;
@@ -14,7 +13,7 @@
*/
@Data
@ApiModel("浜哄憳鏌ヨ 鍙傛暟")
-public class MemberQuery implements Serializable {
+public class MemberQuery extends LoginUserModel implements Serializable {
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
private String keyword;
@@ -56,9 +55,13 @@
@ApiModelProperty(value = "娴峰悍鐘舵�� 0寰呬笅鍙� 1鎴愬姛2澶辫触")
private Integer hkStatus;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵��")
+ private Integer workStatus;
@ApiModelProperty(value = "鎿嶄綔浜哄憳 ")
private Integer createrId;
+ @ApiModelProperty(value = "宀椾綅ID")
+ private Integer positionId;
@@ -66,6 +69,8 @@
private String erpOrgId;
@ApiModelProperty(value = "鏈烘瀯涓婚敭 ")
private Integer companyId;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐 ")
+ private Integer companyType;
@ApiModelProperty(value = "鏄惁鍖呭惈涓嬬骇缁勭粐鐢ㄦ埛")
private Boolean includeChild;
--
Gitblit v1.9.3