From a889370c4655706b5b6be33951dd7142ee818a46 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 25 八月 2023 14:44:17 +0800
Subject: [PATCH] 1.新增订单支付方式dto 2.部分dto新增参数

---
 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