Merge branch 'master' into master-test

wangrenhuang

2023-03-23 fcf8b677cf0a8165da424b642a9ade51aa91e7e9

 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;
@@ -76,9 +75,4 @@
    @PostMapping("user/level/progress")
    Result userLevelProgress(@RequestBody JSONObject parmData);

    /**
     * 用户升级进度
     */
    @PostMapping("/user/merge/log/add")
    Result userMergeAdd(@RequestBody UserMergeDto userMergeDto);
}