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

admin

2019-09-23 0392154afd78f314386c2e6669ead9a2c89c79b4

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

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

   int updateByPrimaryKey(DeviceTokenIOS record);
   
	
	
	
}