Merge remote-tracking branch 'origin/master'

depot-web/src/main/resources/static/app/intelligent/aeration/service/aerationTaskRecordService.js

@@ -1,6 +1,6 @@
 "use strict";
 
-angular.module('app.intelligent').service("aerationTaskRecordService", function($http, $q,rootScope, APP_CONFIG) {
+angular.module('app.intelligent').service("aerationTaskRecordService", function($http, $q,$rootScope, APP_CONFIG) {
 	//通风记录查询
 	this.getPageInfo = function (pageNum, pageSize, aerationTaskRecord,type) {
 		var d = $q.defer();