From 0e62463b823613faee3004eeee5c6f95ba15ef3c Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 24 十一月 2019 10:54:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/SystemZnxMapper.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/SystemZnxMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/SystemZnxMapper.java
index fa7a046..89dfc27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/SystemZnxMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/SystemZnxMapper.java
@@ -1,16 +1,16 @@
-package com.yeshi.fanli.dao.mybatis.msg;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.system.SystemZnx;
-
-public interface SystemZnxMapper extends BaseMapper<SystemZnx>{
-	
-	List<SystemZnx> listbyCreateTime(@Param("createTime")long createTime);
-	
-	
-	List<SystemZnx> listbyUidAndCreateTime(@Param("uid")long uid, @Param("createTime")long createTime);
+package com.yeshi.fanli.dao.mybatis.msg;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.system.SystemZnx;
+
+public interface SystemZnxMapper extends BaseMapper<SystemZnx>{
+	
+	List<SystemZnx> listbyCreateTime(@Param("createTime")long createTime);
+	
+	
+	List<SystemZnx> listbyUidAndCreateTime(@Param("uid")long uid, @Param("createTime")long createTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0