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

admin

2019-12-14 63d7d733938c8ea2fbb046625f1f70d6c48f8673

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

@@ -10,7 +10,6 @@
import javax.persistence.Table;





@Entity

@Table(name="yeshi_ec_push_queue")

@org.yeshi.utils.mybatis.Table("yeshi_ec_push_queue")

public class PushQueueRecord {