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

admin

2019-08-01 292937c16f7ad0021b8cd2dfb8fcc0cdf26f59de

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

@@ -27,6 +27,16 @@
   private Date createTime;

   @Column(name = "da_updatetime")

   private Date updateTime;

   @Column(name = "da_ip")

   private String ipInfo;



   public String getIpInfo() {

      return ipInfo;

   }



   public void setIpInfo(String ipInfo) {

      this.ipInfo = ipInfo;

   }



   public Long getId() {

      return id;