Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-07 a0c76f1c31cc9277bb149aae8798bbff9edeb20a

 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;
}