冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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

	
}