Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

# Conflicts:
#	dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

@@ -2,6 +2,8 @@ package com.dsk.common.dtos;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 组合查询参数
  * @author Administrator
@@ -48,13 +50,16 @@ public class JskBidPlanDto {
 	String projectCapitalSource;
 	//发布时间
 	String issueTime;
+	//发布时间开始
+	Date startIssueTime;
+	//发布时间结束
+	Date endIssueTime;
 	//计划发布开始时间
 	String planTenderDateStart;
 	//计划发布截止时间
 	String planTenderDateEnd;
 	//来源网站
 	String sourceName;
-
 	/**
 	 * 修改时间
 	 */