From 358acf8fc7ce253592312c00c0c8d335c77f039b Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 19 九月 2023 15:01:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 3768939..6d7ad5e 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,5 @@
 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;
 
@@ -35,13 +33,15 @@
     private Integer isSelectShop = 0;
     /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
     private Integer isSelectInvitee = 0;
+    /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+    private Integer isSelectMoney = 0;
     /**鏄惁鏈夐棬搴�*/
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
-
+    /**寮�濮嬫椂闂�*/
     private Date startTime;
-
+    /**缁撴潫鏃堕棿*/
     private Date endTime;
 
 }

--
Gitblit v1.8.0