java/zhihuishenqu.git

			@@ -102,7 +102,7 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date endTime;

			@ApiModelProperty("参与人数")
			@ApiModelProperty("参与讨论人数")
			private Integer joinNum;

			@ApiModelProperty("单张图片宽度")
			@@ -116,4 +116,13 @@

			@ApiModelProperty("每人票数")
			private Integer count;

			@ApiModelProperty("剩余可投票数")
			private Integer remainingVotes;

			@ApiModelProperty("已投票记录列表")
			private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;

			@ApiModelProperty("已参与投票人数")
			private Integer votedPersonNum;
			}