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

admin

2020-05-13 60a099a7edfd81a3b10c766e113c019cdef6cd3d

 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;