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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

 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) {