Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

puzhibing

2026-09-21 008ffb622f7e8b941245a4cf19042c7baef39b24

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java

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

    @ApiModelProperty(value = "商户数量")
    private Integer shopNum;
    
    @ApiModelProperty(value = "商户名称")
    private String shopName;
    
    @ApiModelProperty(value="成员UserID")
    private String userid;