Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 c3552aecdf5bede004b63981bab80aca5d462154

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

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

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


}