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

wangrenhuang

2023-10-10 72bbcf99e4eee03402278fa506c45a7d135d5d51

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

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

@@ -46,6 +46,8 @@
    private BigDecimal totalIntegral;
    /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值  */
    private BigDecimal refundTotal;
    /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值  */
    private BigDecimal refundIntegral;
    /** 可退款方式集合 */
    private List<OrderPayMethodDto> payMethodList;
    /** 可退款优惠券信息集合 */

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

@@ -16,7 +16,7 @@
    private String fromCode;

    /**
     * 来源名称
     * 来源名称/来源路径
     */
    private String fromName;


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

@@ -108,4 +108,10 @@
     */
    @PostMapping(value = "/user/gzh/info")
    Result userGZHInfo(@RequestBody UserParamDto userParamDto);

    /**
     * 开放平台-获取crm小程序跳转链接
     */
    @PostMapping(value = "/user/crm/url/link")
    Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);
}