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

admin

2020-04-30 feee59af9b9d8173e28d7cde588b1ef9fcdb7efd

 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;