Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/common/controller/CensusController.java

@@ -811,6 +811,7 @@ public class CensusController {
         Integer finalCounty_apply_month_change = county_apply_month_change;
         List<Map<String, Object>> result = new ArrayList<Map<String, Object>>() {{
             add(new LinkedHashMap<String, Object>() {{
+                put("tip", "区市部门");
                 put("level", "county");
                 put("apply_sum", county_apply_sum);
                 put("resource_sum", county_resource_sum);
@@ -820,6 +821,7 @@ public class CensusController {
                 put("apply_month_change", finalCounty_apply_month_change);
             }});
             add(new LinkedHashMap<String, Object>() {{
+                put("tip", "市级部门");
                 put("level", "municipal");
                 put("apply_sum", municipal_apply_sum);
                 put("resource_sum", municipal_resource_sum);