Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/UserReportServiceImpl.java

@@ -353,7 +353,8 @@ public class UserReportServiceImpl implements UserReportService {
 
         List<QxFrontlineAgentDto> getQxFrontlineAgentList = sysUserMapper.getQxFrontlineAgentList(qxFrontlineAgentVo);
         if (qxFrontlineAgentVo.getManagementSource().equals("1")) {// 渠道
-            this.channelPerson(getQxFrontlineAgentList, qxFrontlineAgentVo);
+            getQxFrontlineAgentList .clear();
+            getQxFrontlineAgentList.addAll(userReportMapper.selectChannelPersonOld(qxFrontlineAgentVo));
         } else if (qxFrontlineAgentVo.getManagementSource().equals("2")) {// 代理人
             this.agentPerson(getQxFrontlineAgentList, qxFrontlineAgentVo);
         }