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

yujian

2019-07-30 dadacf7c1065876248bec86cf17c06ca4be1b97c

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

@@ -66,6 +66,10 @@
   @Expose

   @Column(name = "umd_type")

   private UserMoneyDetailTypeEnum type;

	
   @Column(name = "umd_order_type")

   private Integer orderType;//和订单相关数据才处理

	
   @Expose

   @Column(name = "umd_title")

   private String title;// 标题

@@ -192,6 +196,15 @@
   public void setUpdateTime(Date updateTime) {

      this.updateTime = updateTime;

   }

	
   public Integer getOrderType() {

      return orderType;

   }



   public void setOrderType(Integer orderType) {

      this.orderType = orderType;

   }







}