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

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/vos/LoginRequest.java

@@ -1,5 +1,6 @@
package com.panzhihua.applets.model.vos;

import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,4 +29,8 @@

    @ApiModelProperty(name = "iv",value = "加密算法的初始向量")
    String iv;

    @ApiModelProperty(name = "userInfo",value = "用户基本信息")
    WxMaUserInfo userInfo;

}