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

jinpengyong

2023-08-24 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9

 screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java

@@ -64,11 +64,17 @@
                CompareFieldResult result = new CompareFieldResult();
                result.setFieldName(field.getName());
                result.setFieldAnnoName(annotation.value());
                result.setNewData(newDataObj.toString());
                if(oldDataObj==null)

                if(newDataObj.equals(""))
                    result.setNewData("null");
                else
                    result.setNewData(newDataObj.toString());

                if(oldDataObj==null||oldDataObj.equals(""))
                    result.setOldData("null");
                else
                    result.setOldData(oldDataObj.toString());

                results.add(result);
            }
        }catch (IntrospectionException e) {