Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-03 0a63d22e38a644bc83b393ed85618b04d3be858b

 fanli/src/main/java/com/yeshi/fanli/entity/order/ESOrder.java

@@ -31,7 +31,7 @@
   // 交易id

   @Field(index=true, store = true, type = FieldType.Text)

   private String tradeId;

   // 交易平台

   // 交易平台 (1淘宝 2京东  3拼多多)

   @Field(index=true, store = true, type = FieldType.Integer)

   private Integer platform;