Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

 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));
    }


@@ -47,7 +47,6 @@
     */
    @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
    @GetMapping("/selectById")
    @Authorization
    ResultData selectConfigById(@RequestParam("id") String id){
        return ResultData.success(iOrganizationChartService.selectConfigById(id));
    }