Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

7 天以前 461fcac5e3089c4ba48e6e43b6bb88a88a1070d8

 src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.vo.ProductModelVo;
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.bean.dto.ProcurementPageDto;
import org.apache.ibatis.annotations.Param;

import java.util.List;