Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-09 0398509aa5f27bd6f987adf3d24eceef56b07b4c

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/Coupon.java

@@ -76,13 +76,13 @@
    /**
     * 折扣金额
     */
    @TableField("dicount_money")
    private BigDecimal dicountMoney;
    @TableField("discount_money")
    private BigDecimal discountMoney;
    /**
     * 折扣百分比
     */
    @TableField("discout_percent")
    private BigDecimal discoutPercent;
    @TableField("discount_percent")
    private BigDecimal discountPercent;
    /**
     * 使用范围1.全场2.指定商品
     */