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

chenjiahe

2023-08-22 a6eab70d0158d0d598225c0fec4ff96b27e84856

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

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

@@ -26,6 +26,8 @@
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
    /** Y-自动作废划扣  0否1是（整单退的时候用到）*/
    private Integer deductionCancel = 0;

    /** 操作人员工标识*/
    private String operatorId;

 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java

@@ -2,6 +2,8 @@

import lombok.Data;

import java.math.BigDecimal;

/**
 * 退款-作废划扣
 * @author CJH
@@ -9,11 +11,16 @@
@Data
public class RefundDeductionCancelVo {

    /**Y-划扣项目记录标识*/
    /**Y-划扣项目记录标识（暂时用不上）*/
    private String deductionProjectId;
    /**Y-划扣总记录标识*/
    private String deductionSingleId;
    /**所属用户项目*/
    private String userProjectItemId;

    /**划扣金额（系统传值使用）*/
    private BigDecimal deductionAmount;
    /**划扣数量（系统传值使用）*/
    private Integer num;

}