Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 8ca8432f7dfb2c58ff6c0f9d1f7224b262bdaba4

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

@@ -101,6 +101,8 @@
        Goods goods = this.getById(goodsId);
        GoodsVO goodsVO = new GoodsVO();
        BeanUtils.copyBeanProp(goodsVO, goods);
        goodsVO.setGoodsId(goods.getId());
        goodsVO.setGoodsName(goods.getName());
        goodsVO.setSellingPrice(sellingPrice);
        goodsVO.setIntegral(integral);
        return goodsVO;