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

cjl

2023-07-21 1393ec7b94738419acbfd340cf24d3debaa2b73e

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


}