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

jinpengyong

2023-08-03 57f903e0eb21bd66c88ebc00ccc9d30b49d36f3e

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

}