Merge branch 'dev'
This commit is contained in:
commit
e0cd927455
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue