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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

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

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


}