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

yujian

2019-09-17 c3f394fc6d624170d5a0cddff57b7a259fda3f0a

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

@@ -19,6 +19,8 @@
   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);