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

cjl

2023-07-10 90362d592d28927e5ab56f9b24f97d1f9089b50b

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

}