From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java b/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java
index 805adcb..95d3716 100644
--- a/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java
@@ -70,7 +70,7 @@
else
result.setNewData(newDataObj.toString());
- if(oldDataObj==null)
+ if(oldDataObj==null||oldDataObj.equals(""))
result.setOldData("null");
else
result.setOldData(oldDataObj.toString());
--
Gitblit v1.8.0