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

admin

2020-01-08 dddbd7fc24aec7d71522641da8bf3804b1b858fd

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

@@ -10,6 +10,7 @@


   public static final int PLATFORM_ANDROID = 1;

   public static final int PLATFORM_IOS = 2;

   public static final int PLATFORM_WXMP = 4;//微信小程序



   @Column(name = "da_id")

   private Long id;