From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/DemoMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DemoMapper.java b/src/main/java/com/moral/mapper/DemoMapper.java
index 7f4c4fb..135e128 100644
--- a/src/main/java/com/moral/mapper/DemoMapper.java
+++ b/src/main/java/com/moral/mapper/DemoMapper.java
@@ -1,8 +1,12 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
import java.util.List;
import java.util.Map;
public interface DemoMapper {
- List<Map<String, Object>> getDatas();
+ List<Map<String, Object>> getDatas(Map<String, Object> parameters);
+ List<Map<String, Object>> selectByTimeZones(@Param("startTime") Date startTime,@Param("endTime") Date endTime);
}
\ No newline at end of file
--
Gitblit v1.8.0