Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 27b2410ba89a2c73097f7f901fb9bc1c72913a3b

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

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


}