Merge remote-tracking branch 'origin/master-prod-new' into master-test

fwq

2023-04-11 757b44125168fcf4cbe95d15b19e85b03bc149c9

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java

@@ -73,5 +73,6 @@
     * 用户升级进度
     */
    @PostMapping("user/level/progress")
    Result userLevelProgress(@RequestBody JSONObject parmData);
    Result userLevelProgress(@RequestBody JSONObject paramData);

}