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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 src/main/java/com/mzl/flower/entity/payment/Bill.java

@@ -51,4 +51,6 @@
    @TableField("bill_date")
    private LocalDate billDate;//账单日期

    @TableField("member_coupon_amount")
    private BigDecimal memberCouponAmount;//优惠券金额
}