Merge branch 'master' into 'test'

罗yu 元桥

2021-04-28 b6082fe75b377ac9c177736d98f36ae46e7cdb70

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

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





    @ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
    private Integer isTips;

}