From 2ac14cef837ceaa5201d6266485ab672f6f3d650 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 15:08:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd_new' into sqd_new
---
src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
index 05d5792..e975161 100644
--- a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
@@ -7,6 +7,10 @@
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import org.apache.ibatis.annotations.Param;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慚apper鎺ュ彛
@@ -22,4 +26,7 @@
ProductModel selectLatestRecord();
+ List<Map<String, Object>> getProductAndModelList();
+
+ List<HashMap<String, Object>> listProduct();
}
--
Gitblit v1.9.3