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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java

@@ -33,6 +33,7 @@


   public final static int ORDER_TYPE_TAOBAO = 1;// 淘宝

   public final static int ORDER_TYPE_JINGDONG = 2;// 京东

   public final static int ORDER_TYPE_PDD = 3;// 拼多多



   @Id

   @GeneratedValue(strategy = GenerationType.AUTO)