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

Pu Zhibing

3 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

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

@@ -5,10 +5,16 @@

@Data
public class ShopRelUserVo {

    @ApiModelProperty("商户id")
    
    @ApiModelProperty(value = "商户id")
    private Long shopId;

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