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

yujian

2020-03-25 010760fd974453a70948fef465284d8c817314f5

 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;