Merge remote-tracking branch 'origin/feature/yc-mysql_erp-1020' into feature/yc-mysql_erp-1020

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -26,7 +26,7 @@ define(['app/app'], function(app) {
 				toaster.pop('error', '获取企业信息失败');
 			});
 		}
-		if ($scope.userInfo.enterprise) {
+		if (typeof $scope.userInfo != 'undefined' && typeof $scope.userInfo.enterprise != 'undefined') {
 			getEnterprise();
 		} else {
 			AuthenticationService.getAuthentication().success(function (data) {