Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 9658e5ca43e617c68c54d7dd7797f873e55311c3

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java

@@ -28,7 +28,7 @@
    public ShopGoods getByShopIdAndGoodsId(Long shopId,String goodsId){
        LambdaQueryWrapper<ShopGoods> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(ShopGoods::getDelFlag, 0).eq(ShopGoods::getShopId, shopId).eq(ShopGoods::getGoodsId, goodsId);
        ShopGoods shopGoods = this.getOne(queryWrapper);
        ShopGoods shopGoods = this.getOne(queryWrapper,false);
        return shopGoods;
    }
}