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/taobao/TaoBaoWeiQuanOrderMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
index cb049aa..8d6a833 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
@@ -1,10 +1,10 @@
package com.yeshi.fanli.dao.mybatis.taobao;
import java.util.List;
-import java.util.Map;
import org.apache.ibatis.annotations.Param;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
public interface TaoBaoWeiQuanOrderMapper {
@@ -40,7 +40,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countWeiQaunOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+ List<ChartTDO> countWeiQaunOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
@@ -52,7 +52,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countWeiQaunOrderMoney(@Param("dateType") Integer dateType, @Param("year") String year,
+ List<ChartTDO> countWeiQaunOrderMoney(@Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
--
Gitblit v1.8.0