From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 30 七月 2019 09:07:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java | 7 ++++--- 1 files changed, 4 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..71b1630 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 @@ -33,6 +33,7 @@ public final static int ORDER_TYPE_TAOBAO = 1;// 娣樺疂 public final static int ORDER_TYPE_JINGDONG = 2;// 浜笢 + public final static int ORDER_TYPE_PDD = 3;// 鎷煎澶� @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -141,9 +142,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