From f18d57769635a2bc4eda0fc5e93bbe928e3c19c7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 08 八月 2023 09:56:54 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index ed54f6e..3768939 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,7 +1,11 @@
 package com.hz.his.dto.user;
 
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import com.hz.his.dto.PageDto;
 import lombok.Data;
+
+import java.util.Date;
 
 
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@@ -26,11 +30,18 @@
     /**鎵�灞為【闂悕绉�*/
     private String beCorpUser;
     /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
-    private Integer isSelectCorp;
+    private Integer isSelectCorp = 0;
     /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
-    private Integer isSelectShop;
+    private Integer isSelectShop = 0;
+    /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectInvitee = 0;
     /**鏄惁鏈夐棬搴�*/
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
+
+    private Date startTime;
+
+    private Date endTime;
+
 }

--
Gitblit v1.8.0