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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java

@@ -21,9 +21,7 @@
    private String value;

    public boolean valid() {
        if (ObjectUtils.isEmpty(id) ||
                ObjectUtils.isEmpty(key) ||
                ObjectUtils.isEmpty(value))
        if (ObjectUtils.isEmpty(id))
            return false;
        return true;
    }