Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

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

@@ -38,7 +38,7 @@
    public GoodsFile getGoodsPicture(String goodsId){
        LambdaQueryWrapper<GoodsFile> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(GoodsFile::getDelFlag, 0).eq(GoodsFile::getGoodsId, goodsId).eq(GoodsFile::getFileType,1);
        GoodsFile goodsFile = this.getOne(queryWrapper);
        GoodsFile goodsFile = this.getOne(queryWrapper,false);
        return goodsFile;
    }