From 1070eb501c0075e3f40f4506c2d9e5ddb9c597b9 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期三, 09 四月 2025 16:20:33 +0800 Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after 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