Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

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

@@ -470,6 +470,7 @@ public class ChannelController extends BaseApiController {
 			 }
 		}
 		try {
+			channel.setUserId(oldChannel.getUserId());
 			channelService.updateChannel(channel, mobileChange);
 		} catch (Exception e) {
 			return AjaxResult.error("经销商'" + channel.getName() + "'编辑失败");
@@ -579,7 +580,7 @@ public class ChannelController extends BaseApiController {
 			channelVO.setParentName(parentChannel.getName());
 		}
 		// 统计今天的分润金额
-			Date zero = DateUtils.getNowZero(); // 获取当天零点零分时间
+		Date zero = DateUtils.getToday(); // 获取当天零点零分时间
 		QueryWrapper<ChannelCommission> queryWrapper = new QueryWrapper<ChannelCommission>();
 		queryWrapper.select("IFNULL(sum(comm_amt) ,0) as commAmt");
 		queryWrapper.lambda().eq(ChannelCommission::getChannelId, channelId);