From ec1881f3554866aeeaebf12922bf37a1580040f2 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期二, 08 八月 2023 16:44:21 +0800 Subject: [PATCH] Merge branch 'rx-优惠券查询补充条件' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java index 51abc4e..1da7e96 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java +++ b/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); } \ No newline at end of file -- Gitblit v1.8.0