Merge branch 'master' of http://47.100.37.243:10080/wutt/game.git

minigame/src/com/hssx/controller/UserController.java

@@ -212,7 +212,7 @@ public class UserController {
 	 * @param response
 	 */
 	@RequestMapping(value = "getUserOrderByCity")
-	public void getUserOrderByCity(HttpServletResponse response){
+	public void getUserOrderByCity(HttpServletResponse response) throws Exception {
 		HttpRespMsg msg = new HttpRespMsg();
 		msg.data = usermapper.countUserGroupByCity();
 		response.setContentType("application/json");