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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

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

@@ -87,9 +87,5 @@
    @TableField(exist = false)
    private List<ManageMenu> children;

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

}