Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

@@ -11,7 +11,9 @@
@Data
public class RefundDeductionCancelVo {

    /**Y-划扣项目记录标识（暂时用不上）*/
    /**Y-划扣记录编号*/
    private String deductionNo;
    /**Y-划扣项目记录标识*/
    private String deductionProjectId;
    /**Y-划扣总记录标识*/
    private String deductionSingleId;