Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 0b0a5ccd1f42342a3ec7e2e2bbe74bfad4fe066e

 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;