From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

---
 basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
index 28978a2..c8b4f8b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
@@ -25,18 +25,17 @@
     /**
      * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
      * @param page
-     * @param record
+     * @param standardProductListUpdateRecordDto
      * @return
      */
-    IPage<StandardProductListUpdateRecordDto> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record);
+    IPage<StandardProductListUpdateRecordDto> standardProductListRecordPage(Page page, StandardProductListUpdateRecordDto standardProductListUpdateRecordDto);
 
     /**
-     * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
-     * @param page
+     * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ
      * @param standardProductListUpdateRecordRel
      * @return
      */
-    IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel);
+    Map<String,Object> standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel);
 
     /**
      * 鏍囧噯鏍戜笅淇敼璁板綍鏂囦欢涓婁紶

--
Gitblit v1.9.3