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

cjl

2023-10-25 7e0534d52520407b1005e9a5f20945d927e92408

 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());