Merge remote-tracking branch 'origin/dev' into dev

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

@@ -171,12 +171,12 @@ public class CensusController {
             };
             dbAmount.add(nullMap);
         });
-        new HashMap<String, Object>() {
+        dbAmount.add(new HashMap<String, Object>() {
             {
                 put("amount", jdbcTemplate.queryForObject("SELECT COUNT(id) FROM t_meetingroom_book;", Long.class));
                 put("type", "会客厅");
             }
-        };
+        });
         return new Result<List<Map<String, Object>>>().ok(dbAmount);
     }