Merge remote-tracking branch 'origin/div' into div

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

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

@@ -19,7 +19,14 @@
   int updateByPrimaryKey(DeviceActive record);

   DeviceActive selectByDeviceAndPlatform(@Param("device") String device, @Param("platform") int platform);
	
   DeviceActive selectFirstByDeviceAndPlatform(@Param("device") String device, @Param("platform") int platform);

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