Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java

@@ -141,9 +141,9 @@
//      return orderItemList;

//   }

//

//   public void setOrderItemList(List<OrderItem> orderItemList) {

//      this.orderItemList = orderItemList;

//   }

//public void setOrderItemList(List<OrderItem> orderItemList) {

//   this.orderItemList = orderItemList;

//}



   public void setId(Long id) {

      this.id = id;