Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

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

@@ -31,7 +31,6 @@
   public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";

   public final static String TYPE_SHARE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_share.png";

   

	
   @Column(name = "co_id")

   private Long id;



@@ -90,6 +89,9 @@
   // 收货时间-结算时间

   @Column(name = "co_settle_time")

   private Date settleTime;



   @Column(name = "co_order_by")

   private Integer orderBy;// 子订单的排序值



   // 创建时间

   @Column(name = "co_create_time")

@@ -219,6 +221,14 @@
      this.settleTime = settleTime;

   }



   public Integer getOrderBy() {

      return orderBy;

   }



   public void setOrderBy(Integer orderBy) {

      this.orderBy = orderBy;

   }



   public Date getCreateTime() {

      return createTime;

   }