Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-16 a3e1aec60d2f886b8c48966c889b567719d0c5ea

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

@@ -19,10 +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);
	
}