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

cjl

2023-08-18 41660a11fb793295d44a4d47949284105e429395

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

@@ -69,9 +69,6 @@
    private String isDelete;


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


}