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

fwq

2022-12-12 541e9a5eb10f788f1f8067823fa6f71e1b52c31e

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

@@ -31,4 +31,7 @@
    private BigDecimal discount;
    /** 划扣现金总金额(作用:用来计算划扣项目的执行金额,支付方式是现金支付的总金额) */
    private BigDecimal snapPayTotal=BigDecimal.ZERO;

    /**是否确认订单*/
    private Integer isCustomerConfirm;
}