Merge remote-tracking branch 'origin/release-201839-wangcz' into release-201839-wangcz

src/main/webapp/resources/js/admin/controllers/StoreQualificationCtrl.js

@@ -138,6 +138,7 @@ define([ 'app/app' ], function(app) {
 				$scope.application = apply || {};
 				//初始化时备份一遍数据
 
+                apply.enType === 'HK' ? $scope.tab = 'HK' : $scope.tab = 'MAINLAND';
 				var qualifications = apply.qualifications || [];
 				$scope.brands = apply.brands || [];
 				$scope.brandsBackup = angular.copy($scope.brands);