Merge branch 'dev' into 'mp-server-test'

渠道经营数据

See merge request quanshu/mp-server!44

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelController.java

@@ -270,10 +270,9 @@ public class ChannelController extends BaseApiController {
 			channelId = _channelId;
 		}
 		days = days > 0?days:1;
-		days = days > 0?days:1;
 		Channel channel = channelService.getById(channelId);
 		// 查询今日的销售额、佣金收入、新增用户数
-		ChannelOperDataVO channelOperDataVO = channelService.getChannelOperData(channel.getChannelNo(), 1);
+		ChannelOperDataVO channelOperDataVO = channelService.getChannelOperData(channel.getChannelNo(), days);
 		return AjaxResult.success(channelOperDataVO);
 	}