Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 2cdbb69378ac6af3786b8800977de437ba53241c

 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;