From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java
index 0bf9942..4e28bad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java
@@ -1,11 +1,11 @@
package com.yeshi.fanli.dao.mybatis.pdd;
import java.util.List;
-import java.util.Map;
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.pdd.PDDOrder;
public interface PDDOrderMapper extends BaseMapper<PDDOrder> {
@@ -27,7 +27,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+ List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
--
Gitblit v1.8.0