Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

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

@@ -241,6 +241,10 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;

    private Long bindingCheckUnitId;

    private Integer backstageType;


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