Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!493

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

@@ -611,7 +611,7 @@ public class CrmController {
 			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true).stream()
 					.filter(CheckUtil.distinctByKey(CrmClientData::getId)).collect(Collectors.toList());
 		} else if (type == 1) // 我负责的客户
-			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,type);
+			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,typei);
 		else if (type == 2) // 我协作的客户
 			crmClientDatas = getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,startFollowTime,endFollowTime,startCreateTime,endCreateTime);
 		else if (type == 3) // 我关注的客户