Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-25 abd19b59926737dad2ca58331bcf38a2f3d1d32b

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

@@ -50,10 +50,12 @@

    @Override
    public GoodsVO goodsDetail(Long goodsId) {
        // TODO 根据会员等级展示价格
        Goods goods = this.getById(goodsId);
        if (Objects.nonNull(goods)){
            GoodsVO goodsVO = new GoodsVO();
            BeanUtils.copyBeanProp(goodsVO, goods);
            return goodsVO;
        }
        return new GoodsVO();
    }