From 3be3f6e670d2e11d7ced76b8202f0ef30b56870f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 10:54:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
index 4dfed5c..1e9646e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
+++ b/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;
--
Gitblit v1.8.0