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

cjl

2023-08-18 239927b057f65a040594f7a4cb08c8881b303797

 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;
    }

}