Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java

@@ -112,7 +112,7 @@ public class SysDeptController {
         List<Map<String, Object>> list_metting = jdbcTemplate.queryForList("SELECT DISTINCT dept from t_meetingroom_book WHERE dept IS NOT NULL;");
         List<String> temp = list.stream().map(index -> index.get("name")).filter(index -> index != null).map(index -> index.toString()).collect(Collectors.toList());
         List<Map<String, Object>> list_ = list_metting.stream().map(index -> index.get("dept")).filter(index -> index != null).collect(Collectors.toList())
-                .stream().filter(index -> !temp.contains(index.toString())).map(index -> new LinkedHashMap() {{
+                .stream().filter(index -> !temp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
                     put("id", null);
                     put("name", index.toString());
                 }}).collect(Collectors.toList());