Merge branch 'test' into test_bak

101captain

2021-09-30 3f50420b42259a88f7e623b16c14b00f52071f4c

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

@@ -178,4 +178,7 @@
    @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
    private Integer bigAgeTips;

    @ApiModelProperty("是否四长四员 1.是 2.否")
    private Integer isFourMember;

}