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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
package com.ruoyi.system.api.domain.vo;
 
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
 
@Data
public class ShopRelUserVo {
    
    @ApiModelProperty(value = "商户id")
    private Long shopId;
    
    @ApiModelProperty(value = "商户数量")
    private Integer shopNum;
    
    @ApiModelProperty(value = "商户名称")
    private String shopName;
    
    @ApiModelProperty(value = "用户姓名")
    private String userName;
}