~jiangyouyao/beauty-erp.git

			@@ -3,6 +3,7 @@
			import com.matrix.core.anotations.Extend;
			import com.matrix.core.tools.DateUtil;
			import com.matrix.system.common.bean.EntityDTOExt;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.util.Date;

			@@ -130,14 +131,14 @@
			/**
			* 开始时间
			*/
			@Extend
			private String commentBeginTime;
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
			private Date commentBeginTime;

			/**
			* 结束时间
			*/
			@Extend
			private String commentEndTime;
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
			private Date commentEndTime;
			private Long companyId;
			public Long getCompanyId() {
			return companyId;
			@@ -157,19 +158,19 @@
			this.dateToStrTime = dateToStrTime;
			}

			public String getCommentBeginTime() {
			public Date getCommentBeginTime() {
			return commentBeginTime;
			}

			public void setCommentBeginTime(String commentBeginTime) {
			public void setCommentBeginTime(Date commentBeginTime) {
			this.commentBeginTime = commentBeginTime;
			}

			public String getCommentEndTime() {
			public Date getCommentEndTime() {
			return commentEndTime;
			}

			public void setCommentEndTime(String commentEndTime) {
			public void setCommentEndTime(Date commentEndTime) {
			this.commentEndTime = commentEndTime;
			}