Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 9d9832c4fc87f8da685f055da7ea7145879b4e0b

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

@@ -139,6 +139,12 @@
    @ApiModelProperty(value = "地区价格")
    private List<GoodsArea> goodsAreaList;

    @TableField(exist = false)
    private String categoryName;

    @TableField(exist = false)
    private Integer showStatus;

    public String getIdStr() {
        return String.valueOf(id);
    }