Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941

 ruoyi-system/src/main/java/com/ruoyi/system/vo/system/RoleInfoVO.java

@@ -10,6 +10,8 @@
    private Long roleId;

    private String roleName;
    private String remark;
    private Integer roleType;

    @ApiModelProperty("菜单id")
    private List<Long> menus;