Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-06-28 1dfa76ad5143a3ddf5f7c4bf0c9fa0e27f6a9065

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

@@ -96,12 +96,16 @@
     */
    @PostMapping(value = "/user/families/room/info/update")
    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);


    
    /**
     * 开放平台- 用户扫码登记模块 注册绑定后创建his助手小程序码(UserCreateMpQrcodeController-bindCreateHisQrcode方法)
     */
    @PostMapping(value = "/user/mp/qrcode/create/his")
    Result bindCreateHisQrcode(@RequestBody com.alibaba.fastjson.JSONObject jsonObject);

    /**
     * 开放平台-用户等级重新计算
     */
    @PostMapping(value = "/user/level/calc")
    Result userLevelCalc(@RequestBody UserParamDto userParamDto);
}