Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

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

@@ -30,7 +30,4 @@

   int updateByPrimaryKey(DeviceTokenIOS record);
   
	
	
	
}