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

jinpengyong

2023-08-04 f64bf4a5879020901fd446e914dfb5914d998c0f

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


}