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

fwq

2023-04-11 757b44125168fcf4cbe95d15b19e85b03bc149c9

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

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -13,6 +13,8 @@
    private String userId;
    /**ciq*/
    private String CIQ;
    /**会员号*/
    private String memberNO;
    /**名称*/
    private String name;
    /**手机号*/

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

@@ -269,4 +269,12 @@
     */
    @PostMapping(value = "/user/info/baseInfo")
    Result userInfoBaseInfo(@RequestParam("userId") String userId);

    /**
     *  判断用户是否是会员
     * @param userDto userId
     * @return
     */
    @PostMapping(value = "/user/check/member")
    Result checkMember(@RequestBody UserDto userDto);
}

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

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

}