From 499fe8b9c0ab0d9eaa578f25cc734136026fa175 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 十二月 2024 16:07:09 +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 | 5 ++++-
1 files changed, 4 insertions(+), 1 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 7f89081..dcd9bf8 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,6 +1,7 @@
package com.doumee.dao.admin.request;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -14,7 +15,7 @@
*/
@Data
@ApiModel("浜哄憳鏌ヨ 鍙傛暟")
-public class MemberQuery implements Serializable {
+public class MemberQuery extends LoginUserModel implements Serializable {
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
private String keyword;
@@ -56,6 +57,8 @@
@ApiModelProperty(value = "娴峰悍鐘舵�� 0寰呬笅鍙� 1鎴愬姛2澶辫触")
private Integer hkStatus;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵��")
+ private Integer workStatus;
@ApiModelProperty(value = "鎿嶄綔浜哄憳 ")
private Integer createrId;
--
Gitblit v1.9.3