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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/vip/UserVIPPreInfo.java

@@ -21,6 +21,8 @@
   public final static int SOURCE_TYPE_ORDER = 1;// 订单型



   public final static int SOURCE_TYPE_TEAM = 2;// 团队型

	
   public final static int SOURCE_TYPE_ARTIFICIAL = 0;// 人工升级



   @Column(name = "vpi_id")

   private Long id;