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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginStoreUserInfoVO.java

@@ -1,5 +1,13 @@
package com.panzhihua.common.model.vos.shop;

import java.util.Date;
import java.util.List;
import java.util.Set;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
@@ -7,16 +15,10 @@
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
import java.util.Set;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -152,7 +154,6 @@
    @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
    private Integer volunteerStatus;


    @ApiModelProperty("是否注册 0 否 1 是")
    private Integer isRegister;

@@ -162,10 +163,7 @@
    @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
    private Integer politicalOutlook;


    @ApiModelProperty("用户商铺信息")
    private ShopStoreVO storeInfo;



}