Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

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