From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'

---
 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