From ed3015095f1b0e88bc579877c678a3fac191381f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 14:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/IServices/IHrSalaryService.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/IServices/IHrSalaryService.cs b/zhengcaioa/IServices/IHrSalaryService.cs
index b85d024..1bc8834 100644
--- a/zhengcaioa/IServices/IHrSalaryService.cs
+++ b/zhengcaioa/IServices/IHrSalaryService.cs
@@ -18,6 +18,9 @@
 
         List<HrSalaryDTO> GetList();
 
+ 
+        HrSalaryDTO GetListByUser(string Userid,int year,int month);
+ 
         List<HrSalaryDTO> GetSalary(string userid, int year, int month);
 
         ResultEntity CheckOk(string id, string user);
@@ -30,7 +33,7 @@
 
         ResultDataEntity<HrSalaryDTO> SearchSalaryByPaging(HrSalaryDTOSearch searchEntity);
 
-        ResultEntity SaveCheckSalary(HrSalaryDTO dto);
+        ResultEntity SaveCheckSalary(HrSalaryUpDTO dto);
 
         void AutoCheck();
     }

--
Gitblit v1.9.1