Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 39ef464a6630a7b2ab99069e3f6bd40a99c48086

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

@@ -61,6 +61,8 @@
        for (Goods goods : goodsList) {
            GoodsVO goodsVO = new GoodsVO();
            BeanUtils.copyBeanProp(goodsVO, goods);
            goodsVO.setGoodsId(goods.getId());
            goodsVO.setGoodsName(goods.getName());
            result.add(goodsVO);
        }
        return result;