Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

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

@@ -219,6 +219,13 @@
    @ApiModelProperty("区域划分")
    private String areaName;

    @ApiModelProperty("是否单位管理员 1是 0否")
    private Integer isCheckUnitAdmin;

    @ApiModelProperty("报道单位id")
    private Long checkUnitId;


    public String retrieveRelationName() {
        return this.type == 3 ? relationName : name;
    }