From e212c4201ffb4518c3c5e1a270491ea95ad1217e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 17 四月 2023 18:30:56 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-prod-new-报表工具
---
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