From cd7240f7651c7d12a718ba4e9496b673bd8efc21 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 06 四月 2023 14:57:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 8 +-------
1 files changed, 1 insertions(+), 7 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 84c0945..cfb5337 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,7 +2,6 @@
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;
@@ -74,11 +73,6 @@
* 鐢ㄦ埛鍗囩骇杩涘害
*/
@PostMapping("user/level/progress")
- Result userLevelProgress(@RequestBody JSONObject parmData);
+ Result userLevelProgress(@RequestBody JSONObject paramData);
- /**
- * 鐢ㄦ埛鍗囩骇杩涘害
- */
- @PostMapping("/user/merge/log/add")
- Result userMergeAdd(@RequestBody UserMergeDto userMergeDto);
}
\ No newline at end of file
--
Gitblit v1.8.0