Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertInviteManage.java

@@ -77,6 +77,7 @@ public class ExpertInviteManage {
                 .select(ExpertUserFullInfo::getUserId,
                         ExpertUserFullInfo::getId,
                         ExpertUserFullInfo::getCompany,
+                        ExpertUserFullInfo::getExpertName,
                         ExpertUserFullInfo::getPhoneNo)
                 .eq(ExpertUserFullInfo::getExpertAccountStatus, ExpertAccountStatusEnum.AVAILABLE.getKey());
     }

pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java

@@ -87,7 +87,8 @@ public class ExpertInviteTask {
     }
 
     private CacheHashKey getCacheKey(Long meetingId) {
-        return new CacheHashKey(MEETING_ID_INVITE_RANDOM, meetingId, EXPIRE_TIME);
+        String meetingIdStr = meetingId == null ? null : meetingId.toString();
+        return new CacheHashKey(MEETING_ID_INVITE_RANDOM, meetingIdStr, EXPIRE_TIME);
     }
 
     @PostConstruct