Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-09-01 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7

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