Merge remote-tracking branch 'origin/master'

yz

2021-03-15 c12ca804e93a7f62b006dca60fa3d8797e0480d8

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DicController.java

@@ -42,6 +42,7 @@
    @GetMapping("list")

    public FebsResponse dicList(QueryRequest request, Dic dic) {
        System.out.println("Hello Word");
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.dicService.findDics(request, dic));
        return new FebsResponse().data(dataTable);
    }