From f7540c77c4598dcc0407d2ab56ef617b829fc47e Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 08 九月 2023 10:27:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into rx-0907-优惠券成本归属

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |    4 ++--
 1 files changed, 2 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 3768939..64e4d71 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,6 +33,8 @@
     private Integer isSelectShop = 0;
     /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
     private Integer isSelectInvitee = 0;
+    /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+    private Integer isSelectMoney = 0;
     /**鏄惁鏈夐棬搴�*/
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/

--
Gitblit v1.8.0