Merge branch 'bzq1/pool_317_stl_rename' of eta_server/eta_api into debug

services/data/stl/stl.go

@@ -67,7 +67,7 @@ func GenerateStlEdbData(req *request.StlConfigReq, adminId int) (resp *response.
 	case LAST_N_YEARS:
 		condition += " AND data_time >=?"
 		year := time.Now().Year()
-		lastNyear, er := strconv.Atoi(req.LastNYear)
+		lastNyear, er := strconv.Atoi(confReq.LastNYear)
 		if er != nil {
 			msg = "最近N年输入不合法"
 			err = er