Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-10-17 5ba6d11373dbdfcc6b1afa5a7f3c350d281c2d3d

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