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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java

@@ -81,6 +81,16 @@
   private String specialId;

   @Column(name = "to_relation_id")

   private String relationId;

   @Column(name = "to_trade_id")

   private String tradeId;//交易ID



   public String getTradeId() {

      return tradeId;

   }



   public void setTradeId(String tradeId) {

      this.tradeId = tradeId;

   }



   public String getSpecialId() {

      return specialId;