Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

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

@@ -34,10 +34,4 @@
     */
    private Integer parentCode;


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

}