Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-23 e2f232a6fc6404513ae53d69405d95d2eb9429ce

 flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java

@@ -28,7 +28,7 @@
    @GetMapping("/getList")
    public TableDataInfo selectConfigList()
    {
        return getDataTable(iOrganizationChartService.selectConfigList("",""));
        return getDataTable(iOrganizationChartService.selectConfigList("","" ,null));
    }