From 75a26dc87580368036cb51155a2e2f8063a36dcc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 27 十一月 2023 19:02:55 +0800
Subject: [PATCH] Merge branch 'master-fwq点诊医生' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |    6 ++++++
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java                |    4 +++-
 2 files changed, 9 insertions(+), 1 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 ab811e8..0973a06 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
@@ -45,7 +45,9 @@
     private Date startTime;
     /**缁撴潫鏃堕棿*/
     private Date endTime;
-    //鏄惁璇勪环
+    /**鏄惁璇勪环*/
     private Integer isEvaluate;
+    /**浼氬憳绫诲瀷*/
+    private Integer memberType;
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index ec91b02..2fb74de 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -365,4 +365,10 @@
     @PostMapping(value = "/user/refund/order/overdue/coupon")
     Result userRefundOrderOverdueCoupon(@RequestBody UserCouponDto userCouponDto);
 
+    /**
+     * 鐢ㄦ埛鐐硅瘖鍖荤敓璁板綍
+     * */
+    @PostMapping(value = "/user/doctor/data/list")
+    Result userDoctorDataList(@RequestBody UserDto userDto);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0