冲突产生的文件

yujian

2019-06-25 e048db91382fa13e0b53e170390eea5fb5931221

 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);

	
}