From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 de63910..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
@@ -1,9 +1,7 @@
package com.yeshi.fanli.entity.bus.user;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,9 +10,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
@@ -120,10 +116,10 @@
@org.yeshi.utils.mybatis.Column(name = "version")
private Integer version;
- @OneToMany(fetch = FetchType.EAGER)
- @JoinTable(name = "yeshi_ec_order_item", joinColumns = { @JoinColumn(name = "oid") }, inverseJoinColumns = {
- @JoinColumn(name = "id") })
- private List<OrderItem> orderItemList = new ArrayList<OrderItem>();
+// @OneToMany(fetch = FetchType.EAGER)
+// @JoinTable(name = "yeshi_ec_order_item", joinColumns = { @JoinColumn(name = "oid") }, inverseJoinColumns = {
+// @JoinColumn(name = "id") })
+// private List<OrderItem> orderItemList = new ArrayList<OrderItem>();
public Order() {
money = BigDecimal.valueOf(0);
@@ -141,13 +137,13 @@
return id;
}
- public List<OrderItem> getOrderItemList() {
- return orderItemList;
- }
-
- public void setOrderItemList(List<OrderItem> orderItemList) {
- this.orderItemList = orderItemList;
- }
+// public List<OrderItem> getOrderItemList() {
+// return orderItemList;
+// }
+//
+//public void setOrderItemList(List<OrderItem> orderItemList) {
+// this.orderItemList = orderItemList;
+//}
public void setId(Long id) {
this.id = id;
--
Gitblit v1.8.0