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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

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

   @Column(name = "trd_update_time")

   private Date updateTime;

   @Column(name = "trd_trade_id")

   private String tradeId;



   public String getTradeId() {

      return tradeId;

   }



   public void setTradeId(String tradeId) {

      this.tradeId = tradeId;

   }



   public Long getId() {

      return id;