fix(大编辑)：bug修复

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -735,6 +735,9 @@ public class CommonEquipDataProcessService {
                         } else if (newVal instanceof Boolean) {
                             fieldChangeMeta.setColumnOldValue(Boolean.toString((Boolean) oldVal));
                             fieldChangeMeta.setColumnNewValue(Boolean.toString((Boolean) newVal));
+                        } else {
+                            fieldChangeMeta.setColumnOldValue(Objects.toString(oldVal , null));
+                            fieldChangeMeta.setColumnNewValue(Objects.toString(newVal, null));
                         }
                         fieldChangeMeta.setDisplayOldValue(formatService.format(displayDefine, fieldChangeMeta.getColumnOldValue()));
                         fieldChangeMeta.setDisplayNewValue(formatService.format(displayDefine, fieldChangeMeta.getColumnNewValue()));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/utils/JsonDiffUtil.java

@@ -115,7 +115,7 @@ public class JsonDiffUtil {
     }
 
     private static boolean isNullOrEmpty(String str) {
-        return str == null || str.trim().isEmpty();
+        return str == null || str.trim().isEmpty() || "null".equals(str);
     }
 
 }