From 9e1db983254a475fd7a069937c3f706fe2efe9b4 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Feb 2018 11:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/ScreenController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 4309f5b..79f60bd 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -298,6 +298,8 @@
 		Account account = accountService.getAccountById(accountId);
 		String regionName = areaService.selectFullNameByCode(code);
 		if(account!=null&&regionName!=null){
+		    //������������
+            regionName = regionName.replace(" ","");
 			Object sensors = sensorService.queryAll();
 			JSONObject params = new JSONObject();
 			params.put("regionCode",code);

--
Gitblit v1.8.0