Merge branch 'master' into master-test

wangrenhuang

2023-11-21 1cc34b1ca79017139b79756dcd6247eb47fc41b6

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java

@@ -20,6 +20,8 @@
    /**支付方式编号集合*/
    private List<String> payMethodList;

    /** 检查优惠券码是否已被使用，默认ture检查，升单是false不检查 */
    private boolean checkCouponNumberIsUse = true;

    /**商品总金额(暂无用-不传)*/
    private BigDecimal total;