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

Pu Zhibing

2 天以前 e7b5f646387af071b879808cef410a698de684d6

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserMenuEditDto.java

@@ -21,5 +21,8 @@
    private Long[] staffMenuIds;


    private String dataScope;

    private String dataScopeEmployee;

}