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

username@email.com

2021-06-28 ed3015095f1b0e88bc579877c678a3fac191381f

 zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs

@@ -77,6 +77,7 @@
        public IActionResult GetList(int year, string sim)
        {
            var list = _simService.SearchSimCostByPage(sim, year);
            
            //var result = new
            //{
            //    total:"1",
@@ -143,7 +144,8 @@
        /// <returns></returns>
        public IActionResult GetSimYearList(SimCostDTOSearch search)
        {
            return new JsonResult(_simService.SearchSimCostYearByPage(search));
            var list = _simService.SearchSimCostYearByPage(search);
            return new JsonResult(list);
        }

        [HttpPost]