Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

MrShi

2024-02-28 92f94b0a4e65b0ab5c4195e632b5e4d1b0158aac

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java

@@ -205,6 +205,13 @@
                            +dataMap.get(Constants.MEMBER_IMG).getCode()
                            +obj.getFaceImg());
                }
                if(Objects.nonNull(obj.getType())){
                    if(!obj.getType().equals(Constants.memberType.visitor)){
                        obj.setExcelCompanyName(obj.getCompanyName());
                    }else{
                        obj.setExcelCompanyName(obj.getVisitCompanyName());
                    }
                }
            });
        }
        return PageData.from(retentionIPage);