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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

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

@@ -61,9 +61,5 @@
    private String isDelete;


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

}