Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-13 128532d205e5a8985690c642bd49ee3a6921a57a

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

@@ -124,15 +124,19 @@
    private Integer vipId;

    @TableField(exist = false)
    @ApiModelProperty(value = "指定门店")
    private List<GoodsShop> goodsShopList;

    @TableField(exist = false)
    @ApiModelProperty(value = "指定用户")
    private List<GoodsAppUser> goodsAppUserList;

    @TableField(exist = false)
    @ApiModelProperty(value = "会员价格")
    private List<GoodsVip> goodsVipList;

    @TableField(exist = false)
    @ApiModelProperty(value = "地区价格")
    private List<GoodsArea> goodsAreaList;