From 2bf30fcc07afd8cfd514dc96239ef1065847a0e3 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期一, 14 八月 2023 15:25:40 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

---
 server/src/main/java/doumeemes/service/business/SalaryParamService.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/business/SalaryParamService.java b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
index 1e89246..f58f513 100644
--- a/server/src/main/java/doumeemes/service/business/SalaryParamService.java
+++ b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
@@ -3,6 +3,8 @@
 import doumeemes.core.model.PageData;
 import doumeemes.core.model.PageWrap;
 import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
+
 import java.util.List;
 
 /**
@@ -14,7 +16,7 @@
 
     /**
      * 鍒涘缓
-     * 
+     *
      * @param salaryParam 瀹炰綋瀵硅薄
      * @return Integer
      */
@@ -48,6 +50,14 @@
      */
     void updateById(SalaryParam salaryParam);
 
+
+    /**
+     * 涓婚敭鏇存柊
+     *
+     * @param salaryParam 瀹炰綋瀵硅薄
+     */
+    void update(SalaryParam salaryParam);
+
     /**
      * 鎵归噺涓婚敭鏇存柊
      *
@@ -78,14 +88,14 @@
      * @return List<SalaryParam>
      */
     List<SalaryParam> findList(SalaryParam salaryParam);
-  
+
     /**
      * 鍒嗛〉鏌ヨ
      *
      * @param pageWrap 鍒嗛〉瀵硅薄
      * @return PageData<SalaryParam>
      */
-    PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap);
+    PageData<SalaryParam> findPage(PageWrap<SalaryParamDTO> pageWrap);
 
     /**
      * 鏉′欢缁熻

--
Gitblit v1.9.3