Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

 src/main/java/com/mzl/flower/entity/coupon/CouponTemplateCustomerDO.java

@@ -29,7 +29,7 @@
     * 指定的顾客id
     */
    @TableField("custom_id")
    private String customId;
    private Long customId;


}