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

fwq

2022-11-08 8b72bd6ea00340d0f0c22b2f6f3ed315c74a2203

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

 phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java

@@ -169,6 +169,9 @@
    /** 康博佳标识(KoapOrderTotal) */
    private String koapOrderId;

    /**订单总金额的折后金额*/
    private BigDecimal disTotal;

    private OrderInfoDto orderInfo;

    private List<String> activityIds;

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

@@ -262,4 +262,11 @@
    @PostMapping(value = "/user/project/items")
    Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);

    /**
     * 获取到用户详情(同步使用)
     * @param userId 用户标识
     * @return 转化使用UserDt
     */
    @PostMapping(value = "/user/info/baseInfo")
    Result userInfoBaseInfo(@RequestParam("userId") String userId);
}