Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

 src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateUserDto.java

@@ -23,8 +23,11 @@
    @ApiModelProperty(value = "邮箱")
    private String email;

    @ApiModelProperty(value = "角色ID")
    private Long roleId;
    @ApiModelProperty(value = "所属公司ID")
    private Long belongId;

    @ApiModelProperty(value = "角色IDS")
    private String roleIds;

    @ApiModelProperty(value = "角色名称")
    private String roleName;