Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-18 b28ed0435f421a2b32661001e625d16a0a06cd9c

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

@@ -129,6 +129,10 @@
    @TableField("bound_shop_superiors_points")
    private Integer boundShopSuperiorsPoints;

    @ApiModelProperty(value = "vip名子")
    @TableField(exist = false)
    private String vipName;

    @TableField(exist = false)
    private List<GoodsArea> goodsAreaList;