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

cjl

2023-07-07 9f965bfa801be97c4683ae53bcb4ce897228fd14

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


}