Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!474

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

@@ -1113,6 +1113,11 @@ public class CrmController {
 			@RequestParam(required = false) Integer groupId, @RequestParam(required = false) Integer belonger,
 			@RequestParam(required = false) Integer groupId, @RequestParam(required = false) Integer belonger,
 			@RequestParam(required = false) String startCreateTime,
 			@RequestParam(required = false) String startCreateTime,
 			@RequestParam(required = false) String endCreateTime) {
 			@RequestParam(required = false) String endCreateTime) {
+		
+		if(endCreateTime != null && !("").equals(endCreateTime)) {
+			endCreateTime = endCreateTime.substring(0, 10)+" 23:59:59";
+		}
+		
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		List<Object> listAll = new ArrayList<Object>();
 		List<Object> listAll = new ArrayList<Object>();
 		listAll.add(cartogram(orgCode, groupId, 1, belonger, startCreateTime, endCreateTime));// 图1
 		listAll.add(cartogram(orgCode, groupId, 1, belonger, startCreateTime, endCreateTime));// 图1