Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

username@email.com

2021-06-28 76430b83e28b43122886c1cd8a9fb1cd61040d22

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -62,6 +62,8 @@
        /// <returns></returns>
        public IActionResult GetList(HrSalaryDTOSearch search)
        {
            _hrSalaryService.AutoCheck();

            return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
        }

@@ -212,6 +214,9 @@
        /// <returns></returns>
        public IActionResult GetSearchList(HrSalaryDTOSearch search)
        {
            //自动确认
            _hrSalaryService.AutoCheck();

            return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
        }