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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 src/main/java/com/mzl/flower/entity/customer/Customer.java

@@ -43,4 +43,6 @@

    @ApiModelProperty("启用/禁用")
    private Boolean isEnabled;
    @ApiModelProperty("等级id")
    private Long levelId;
}