Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-11 8dc86b33e8658d9b1f93c74d48a6742d289efa35

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

@@ -243,6 +243,8 @@

    private Long bindingCheckUnitId;

    private Integer backstageType;


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