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

cjl

2023-07-24 3ce298bd6f26c0807074dc50c73abf0c3abeaf53

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

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


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


}