From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java
index 67a107a..396b741 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java
@@ -1,10 +1,13 @@
 package com.ruoyi.system.mapper.config;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.api.domain.dto.StaffPageDto;
 import com.ruoyi.system.domain.dto.MgtStaffSuggestPageDto;
 import com.ruoyi.system.domain.pojo.config.StaffSuggest;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.vo.MgtStaffSuggestPageVo;
+import com.ruoyi.system.domain.vo.StaffSuggestPageVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,7 +28,7 @@
      * @param suggestTag
      * @return  void
      */
-    void deleteStaffSuggestTag(String suggestTag);
+    void deleteStaffSuggestTag(@Param("suggestTag")String suggestTag);
 
     /**
      * @description 平台获取员工建议列表
@@ -35,5 +38,14 @@
      * @author jqs34
      * @date 2023/6/11 18:26
      */
-    List<MgtStaffSuggestPageVo> pageMgtStaffSuggest(Page page, MgtStaffSuggestPageDto mgtStaffSuggestPageDto);
+    List<MgtStaffSuggestPageVo> pageMgtStaffSuggest(Page page, @Param("param")MgtStaffSuggestPageDto mgtStaffSuggestPageDto);
+
+    /**
+     * @description 分页获取员工建议
+     * @param page
+     * @return List<StaffSuggestPageVo>
+     * @author jqs34
+     * @date 2023/7/16 12:26
+     */
+    List<StaffSuggestPageVo> pageStaffShopSuggest(Page page, @Param("param")StaffPageDto staffPageDto);
 }

--
Gitblit v1.7.1