Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -33,6 +33,7 @@
public class LoginUserInfoVO {

    @ApiModelProperty("user_id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("微信会话密钥")
@@ -123,6 +124,7 @@
    private String tags;

    @ApiModelProperty("家庭id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long familyId;

    @ApiModelProperty(value = "分页每页数量", example = "10")
@@ -144,6 +146,7 @@
    private List<ComMngStructHouseVO> comMngStructHouseVOS;

    @ApiModelProperty("用户小区id")
    @JsonSerialize(using = ToStringSerializer.class)
    // @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
    // @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
    private Long areaId;
@@ -212,12 +215,14 @@
    @ApiModelProperty("areaCode")
    private String areaCode;
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
    private Integer userType;

    @ApiModelProperty("社会组织Id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orgId;

    @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
@@ -233,6 +238,7 @@
    private Integer isCheckUnitAdmin;

    @ApiModelProperty("报道单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;