From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AppVersionInfoMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AppVersionInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AppVersionInfoMapper.java
index 984a1c2..88c33e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AppVersionInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AppVersionInfoMapper.java
@@ -68,5 +68,5 @@
*/
List<AppVersionInfo> listByPlatformAndMaxVersionCode(@Param("platform") String platform,
@Param("maxVersionCode") int maxVersionCode);
-
+
}
\ No newline at end of file
--
Gitblit v1.8.0