Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java

@@ -104,7 +104,7 @@

    @ApiModelProperty(value = "商品权限JSON（0=全部，1=游客，2=普通会员，3=黄金会员，4=钻石会员，5=准代理，6=代理，7=总代，8=合伙人）")
    @TableField("commodity_authority")
    private Integer commodityAuthority;
    private String commodityAuthority;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")