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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-manage/src/main/java/com/moral/api/entity/SysArea.java

@@ -44,9 +44,4 @@
    private List<SysArea> children;


    @Override
    protected Serializable pkVal() {
        return this.areaCode;
    }

}