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

gongzuming

2024-09-20 875de0f786639bc089ff54aeb9a2fcabdf5f832b

 src/main/java/com/mzl/flower/entity/supplier/Supplier.java

@@ -70,5 +70,7 @@
    @ApiModelProperty("是否显示商品")
    private Boolean showed;

    @ApiModelProperty("启用/禁用")
    private Boolean isEnabled;

}