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

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 fanli/src/main/java/com/yeshi/fanli/entity/money/InviteOrderSubsidyDebt.java

@@ -30,6 +30,16 @@
   private Date createTime;

   @Column(name = "sd_update_time")

   private Date updateTime;

   @Column(name = "sd_trade_id")

   private String tradeId;



   public String getTradeId() {

      return tradeId;

   }



   public void setTradeId(String tradeId) {

      this.tradeId = tradeId;

   }



   public Long getId() {

      return id;