Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-16 c017a38ce24bfae8e9d1729210da8511ba85d29e

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -265,7 +265,7 @@
            goodsAreaList1.add(goodsArea);
        });

        goods.setGoodsAreaList(goodsAreaList);
        goods.setGoodsAreaList(goodsAreaList1);
        return goods;
    }
}