From fcf8b677cf0a8165da424b642a9ade51aa91e7e9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 23 三月 2023 18:31:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index e076a63..d35d70e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -2,12 +2,10 @@
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.user.UserListDto;
-import com.hz.his.dto.user.UserMergeDto;
 import com.hz.his.dto.user.UserParamDto;
 import com.hz.his.dto.user.UserUnionDto;
 import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.project.UserProjectDto;
-import feign.Request;
 import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

--
Gitblit v1.8.0