From c302fa88eddece608db44bed2b6bb9de135c390e Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 18 四月 2023 18:02:51 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 4 +---
1 files changed, 1 insertions(+), 3 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 e076a63..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,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;
@@ -75,6 +73,6 @@
* 鐢ㄦ埛鍗囩骇杩涘害
*/
@PostMapping("user/level/progress")
- Result userLevelProgress(@RequestBody JSONObject parmData);
+ Result userLevelProgress(@RequestBody JSONObject paramData);
}
\ No newline at end of file
--
Gitblit v1.8.0