Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

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

@@ -11,6 +11,7 @@

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

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