Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

 ruoyi-system/src/main/java/com/ruoyi/system/dto/SysRoleDTO.java

@@ -18,7 +18,7 @@
    private String roleName;

    @ApiModelProperty(value = "类型")
    private Integer postType;
    private Integer roleType;
    @ApiModelProperty(value = "备注")
    private String remark;