From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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