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

liyong

2026-04-23 a228c5f91173c50ce7f94255dc9a25a7c6703e0c

 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();
}