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

fwq

2024-05-13 f52dc5114638600e934cc82fe63c4a25f22594cc

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

@@ -17,6 +17,8 @@
    private BigDecimal amount;
    /**必填 支付方式*/
    private String method;
    /**必填 抵扣实际支付的金额 如果是积分抵扣现金这里存的是要支付的积分*/
    private BigDecimal deductionAmount = BigDecimal.ZERO;

    /**非必填 商品/项目id/组合项标识(卡项支付时必传组合项标识)*/
    private String commonId;