Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

 fanli/src/main/java/com/yeshi/fanli/entity/accept/AcceptData.java

@@ -14,6 +14,15 @@
   private String osVersion;

   private String network;

   private String imei;

   private String idfa;



   public String getIdfa() {

      return idfa;

   }



   public void setIdfa(String idfa) {

      this.idfa = idfa;

   }



   public String getImei() {

      return imei;