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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

@@ -2,7 +2,6 @@


import java.util.Date;



import javax.persistence.Entity;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

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

import org.yeshi.utils.mybatis.Table;



@Entity

@Table("yeshi_ec_uid_devicetoken_ios")

public class DeviceTokenIOS {