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

admin

2019-11-07 35a0e0c8e70287765a828683f7fdebfb35908559

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

@@ -30,6 +30,8 @@
   Long selectCount(@Param("versionList") List<Integer> versionList);

   List<DeviceTokenHW> selectByDevice(String device);
	
   List<DeviceTokenHW> selectByDeviceForUpdate(String device);

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