Merge branch 'master' into master-test

wangrenhuang

2023-07-16 3de90089345a2bb8c18114885a8d7dcd58a432ce

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

@@ -15,11 +15,14 @@

    /**用户优惠券码标识集合*/
    private List<String> couponNumberIdList;

    /**商品总金额*/
    private BigDecimal total;
    /**商品总件数*/
    private Integer itemNum;
    /**商品信息*/
    private List<CouponCheckItemDto> goodsList;
    /**支付方式编号集合*/
    private List<String> payMethodList;


    /**商品总金额(暂无用-不传)*/
    private BigDecimal total;
    /**商品总件数(暂无用-不传)*/
    private Integer itemNum;
}