Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2 天以前 d0a20f29f07dc24c1fc0b27b8572b24a083d8c0d

 src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java

@@ -25,6 +25,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.NotNull;
import java.util.*;
import java.util.stream.Collectors;

@@ -73,6 +74,11 @@
        return productModelMapper.selectList(queryWrapper);
    }

    @Override
    public List<ProductModel> selectModelListByProductIds(@NotNull List<Long> ids) {
        return productModelMapper.selectModelListByProductIds(ids);
    }

    /**
     * 根据id查询产品规格分页查询
     *