Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 9658e5ca43e617c68c54d7dd7797f873e55311c3

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

@@ -10,6 +10,9 @@
    @ApiModelProperty("成员UserID")
    private String userid;

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

    @ApiModelProperty("手机")
    private String mobile;