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

jinpengyong

2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3

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

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


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

}