phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java
@@ -17,5 +17,5 @@ * 用户合并日志 */ @PostMapping("/user/merge/log/add") Result userMergeAdd(Request.Options options, @RequestBody UserMergeDto userMergeDto); Result userMergeAdd(@RequestBody UserMergeDto userMergeDto); } 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;
