Merge branch 'master-prod-new' into master-test

chenjiahe

2023-03-23 a2513c6a269fb14939a8e5d16b8be13f5931bd86

 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;