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

admin

2020-05-16 94325dc13ea8b7c2d33ed63a78908915599c2fa3

 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;