Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 8bfb698ca80914aa7b8e8e22cdeb7fdc7975bc7c

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -80,7 +80,7 @@
    public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
    {
        entity.setUpdateTime(LocalDateTime.now());
        entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
        entity.setUpdateUserId(sysUser.getUserId());
        return toAjax(iOrganizationChartService.updateConfig(entity));
    }