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

huliguo

10 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java

@@ -140,6 +140,9 @@
    @ApiModelProperty(value="关联用户id 多个用,隔开")
    private String relUserIds;

    @ApiModelProperty(value="默认登录账号-开启的用户id集合")
    private String relUserOpenIds;

    @ApiModelProperty(value="关联用户")
    private String relUsers;