Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

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

@@ -23,10 +23,13 @@
   List<DeviceTokenHW> selectByDeviceAndUid(@Param("device") String device, @Param("uid") Long uid);

   List<DeviceTokenHW> selectList(@Param("start") long start, @Param("count") int count);
	

   List<DeviceTokenHW> selectByUid(Long uid);

   Long selectCount();

   List<DeviceTokenHW> selectByDevice(String device);

   int bindUidByDevice(@Param("uid") Long uid, @Param("device") String device);

}