Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-08 41dc0ffbb2b66fd6da78603adfadd5b574d0aab6

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

@@ -244,6 +244,8 @@

    private Long bindingCheckUnitId;

    private Integer backstageType;


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