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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

 screen-manage/src/main/java/com/moral/api/entity/ManageRoleMenu.java

@@ -54,9 +54,4 @@
    private String isDelete;


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

}