From 827d118f2923861f2aa8871b722f8d104c637a6e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 14 八月 2023 15:55:34 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |    6 ++----
 1 files changed, 2 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..00da1d8 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;
 
@@ -39,9 +37,9 @@
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
-
+    /**寮�濮嬫椂闂�*/
     private Date startTime;
-
+    /**缁撴潫鏃堕棿*/
     private Date endTime;
 
 }

--
Gitblit v1.8.0