From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 0aa31ac..e351875 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/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);
}
--
Gitblit v1.8.0