java/HongRuiTang.git

			@@ -17,16 +17,20 @@
			@Data
			public class MerMemberTaskPageVo {

			@ApiModelProperty(name = "任务id")
			@ApiModelProperty(value = "任务id")
			private String taskId;

			@ApiModelProperty(name = "任务时间")
			private Date taskDate;
			@ApiModelProperty(value = "任务时间")
			private String taskDate;

			@ApiModelProperty("任务内容")
			@ApiModelProperty(value="任务内容")
			private String taskContent;

			@ApiModelProperty("任务内容")
			@ApiModelProperty(value="处理内容")
			private String dealContent;


			@ApiModelProperty(value="今日标记")
			private Integer todayFlag;

			}