Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java

@@ -83,4 +83,13 @@ public class MeetingDetailBasicVO {
     @ApiModelProperty("评审项目信息")
     private List<MeetingReviewProjectDTO> projects;
 
+    @ApiModelProperty("是否已停止邀请")
+    private Boolean invitedStopped;
+
+    @ApiModelProperty("是否已确认名单")
+    private Boolean confirmedRoster;
+
+    @ApiModelProperty("邀请类型")
+    private Integer inviteType;
+
 }

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

@@ -373,6 +373,9 @@ public class MeetingManage {
                 .createOn(meeting.getCreateOn())
                 .creator(meeting.getCreator())
                 .createBy(meeting.getCreator())
+                .inviteType(meeting.getInviteType())
+                .confirmedRoster(meeting.getConfirmedRoster())
+                .invitedStopped(meeting.getInviteStatus())
                 .build();
         if (meeting.getIsInnerProject()) {
             List<MeetingInnerProject> innerProjects = meetingInnerProjectService.listByMeetingId(meetingId);