ANDRU-PC\Andru
2023-07-04 3bbfd6d4e0f3407c54fdbbe02b0f5ea298b582da
Merge branch 'master' into master-test

# Conflicts:
# phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
2个文件已修改
7 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -48,7 +48,8 @@
    /**第三方订单编号*/
    private String otherOrderNo;
    /**第三方兑换码*/
    private String redemptionCode;
    /**结账之后是否直接划扣:0否1是*/
    private Integer directDeduction;
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -96,9 +96,7 @@
     */
    @PostMapping(value = "/user/families/room/info/update")
    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
    /**
     * 开放平台-用户等级重新计算
     */