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

admin

2019-09-23 0392154afd78f314386c2e6669ead9a2c89c79b4

 fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java

@@ -10,7 +10,6 @@
import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@Entity

@Table("yeshi_ec_uid_devicetoken_ios")

public class DeviceTokenIOS {