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

jiangqs

2023-05-04 0bf618ca34814ee535c5d39387dc63532b4e726a

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java

@@ -30,7 +30,7 @@
    public ActivityGoods getByGoodsId(String goodsId){
        LambdaQueryWrapper<ActivityGoods> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(ActivityGoods::getDelFlag, 0).eq(ActivityGoods::getGoodsId, goodsId);
        ActivityGoods activityGoods = this.getOne(queryWrapper);
        ActivityGoods activityGoods = this.getOne(queryWrapper,false);
        return activityGoods;
    }
}