Merge branch 'master-prod-new' into master-test

Andru

2023-12-18 0b124f8a24a37f6f665623b2800989619890f83d

Merge branch 'master-prod-new' into master-test

* master-prod-new:
  1.修改

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

@@ -1,5 +1,7 @@
package com.hz.his.dto.order;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
@@ -56,6 +58,9 @@
    /** 平台来源  因为是his助手取消订单的话就要自动确认退款单  必填*/
    private Integer platformSource;

    /** 是否第三方退款(0否1是) */
    private Integer isThirdPartyRefund = 1;

    /**备用参数*/
    //总订单领建标识
    private String hisOrderId;