From 8e89f95b9db4039f0cb8b4b8dc7974c247366c4c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 21 五月 2026 15:14:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java | 5 +++++
1 files changed, 5 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 bddcca4..6744242 100644
--- a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
@@ -7,6 +7,7 @@
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import org.apache.ibatis.annotations.Param;
+import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
@@ -26,4 +27,8 @@
ProductModel selectLatestRecord();
List<Map<String, Object>> getProductAndModelList();
+
+ List<ProductModel> selectModelListByProductIds(@NotNull @Param("ids") List<Long> ids);
+
+ ProductModel selectOldProductModel(@Param("model") String model, @Param("productName") String productName);
}
--
Gitblit v1.9.3