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

lizijie

2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794

 screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java

@@ -480,7 +480,7 @@
            }
        }

        String content = CompareFieldUtils.resultsConvertContent(results, "修改了组织");
        String content = CompareFieldUtils.resultsConvertContent(results, "修改了组织;组织名称："+oldOrganization.getName());
        logUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
    }