Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!460

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -579,6 +579,14 @@ public class CrmController {
 			@RequestParam(required = false) String endCreateTime,
 			@RequestParam(required = false) String endCreateTime,
 			@RequestParam(required = false) String startFollowTime,
 			@RequestParam(required = false) String startFollowTime,
 			@RequestParam(required = false) String endFollowTime) {
 			@RequestParam(required = false) String endFollowTime) {
+		
+		if(endCreateTime != null) {
+			endCreateTime = endCreateTime.substring(0, 10)+" 23:59:59";
+		}
+		if(endFollowTime != null) {
+			endFollowTime = endFollowTime.substring(0, 10)+" 23:59:59";
+		}
+		
 		Integer empNum = getEmpNum(userBean);
 		Integer empNum = getEmpNum(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		List<CrmClientData> crmClientDatas = null;
 		List<CrmClientData> crmClientDatas = null;