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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ShopRelUserVo.java

@@ -9,6 +9,12 @@
    @ApiModelProperty(value="商户id")
    private Long shopId;

    @ApiModelProperty(value = "商户数量")
    private Integer shopNum;
    
    @ApiModelProperty(value = "商户名称")
    private String shopName;
    
    @ApiModelProperty(value="用户姓名")
    private String userName;
}