冲突

yujian

2019-08-30 ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceActiveMapper.java

@@ -22,4 +22,7 @@

   DeviceActive selectByDeviceToeknMd5AndPlatform(@Param("deviceTokenMd5") String deviceTokenMd5,
         @Param("platform") int platform);
	
   DeviceActive selectFirst(String device);
	
}