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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java

@@ -42,6 +42,8 @@
   private MsgTypeOrderTypeEnum type;// 消息类型

   @Column(name = "mo_order_id")

   private String orderId;// 订单号

   @Column(name = "mo_order_type")

   private Integer orderType;// 订单类型

   @Column(name = "mo_state")

   private Integer state;// 状态

   @Column(name = "mo_goods_count")

@@ -165,4 +167,12 @@
      this.happendDate = happendDate;

   }



   public Integer getOrderType() {

      return orderType;

   }



   public void setOrderType(Integer orderType) {

      this.orderType = orderType;

   }



}