Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java

@@ -20,6 +20,9 @@
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "关联id")
    private Long relationShopId;

    @ApiModelProperty("会员编号")
    private String memberNo;