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

cjl

2023-07-07 7029a780a1738bffdb6b00fa94d7b845f9444a5d

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

}