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

rk

9 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java

@@ -23,6 +23,8 @@

    @ApiModelProperty(value = "主键")
    private Integer id;
    @ApiModelProperty(value = "是否已删除")
    private Integer isdeleted;

    @ApiModelProperty(value = "会议名称")
    private String meetingName;