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

liyong

5 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

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

@@ -7,6 +7,9 @@
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;


/**
 * 【请填写功能名称】Mapper接口
@@ -22,4 +25,5 @@

    ProductModel selectLatestRecord();

    List<Map<String, Object>> getProductAndModelList();
}