From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java |   24 ++----------------------
 1 files changed, 2 insertions(+), 22 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 80b2464..14e851d 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,16 +1,9 @@
 package com.yeshi.fanli.entity.bus.user;
 
+import com.google.gson.annotations.Expose;
+
 import java.math.BigDecimal;
 import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import com.google.gson.annotations.Expose;
 
 /**
  * 璁㈠崟
@@ -18,7 +11,6 @@
  * @author Administrator
  *
  */
-@Table(name = "yeshi_ec_order", uniqueConstraints = @UniqueConstraint(columnNames = { "orderid", "order_type" }) )
 @org.yeshi.utils.mybatis.Table("yeshi_ec_order")
 public class Order {
 	// 璁㈠崟鐘剁姸鎬� -1锛氬け鏁� 0-鏈敮浠� 1-宸叉敮浠�
@@ -30,35 +22,27 @@
 	public final static int ORDER_TYPE_JINGDONG = 2;// 浜笢
 	public final static int ORDER_TYPE_PDD = 3;// 鎷煎澶�
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "id")
 	@org.yeshi.utils.mybatis.Column(name = "id")
 	@Expose
 	private Long id;
 
 	@org.yeshi.utils.mybatis.Column(name = "orderid")
-	@Column(name = "orderid", length = 100)
 	@Expose
 	private String orderId;// 璁㈠崟缂栧彿
 
 	@org.yeshi.utils.mybatis.Column(name = "order_type")
-	@Column(name = "order_type")
 	@Expose
 	private Integer orderType;// 璁㈠崟绫诲瀷 1-娣樺疂 2-浜笢
 
 	@org.yeshi.utils.mybatis.Column(name = "state")
-	@Column(name = "`state`")
 	@Expose
 	private Integer state;// 璁㈠崟鐘讹拷? -1锛氬け鏁�0-鏈敮浠�?1-宸叉敮璐�
 
 	@org.yeshi.utils.mybatis.Column(name = "drawback_time")
-	@Column(name = "`drawback_time`")
 	@Expose
 	private Long drawbackTime;// 閫�娆炬椂闂�
 
 	@org.yeshi.utils.mybatis.Column(name = "createtime")
-	@Column(name = "`createtime`")
 	@Expose
 	private Long createtime;// 鍒涘缓鏃堕棿 浠樻鏃堕棿
 
@@ -68,23 +52,19 @@
 
 	@org.yeshi.utils.mybatis.Column(name = "beizhu")
 	@Expose
-	@Column(name = "`beizhu`", length = 256)
 	private String beizhu;
 
 	@org.yeshi.utils.mybatis.Column(name = "money")
-	@Column(name = "`money`")
 	@Expose
 	private BigDecimal money;
 
 	// 绗笁鏂硅鍗曞垱寤烘椂闂�
 	@org.yeshi.utils.mybatis.Column(name = "third_createtime")
-	@Column(name = "`third_createtime`")
 	@Expose
 	private Date thirdCreateTime;
 
 	// 绗笁鏂硅鍗曠姸鎬�
 	@org.yeshi.utils.mybatis.Column(name = "third_state")
-	@Column(name = "`third_state`")
 	@Expose
 	private String thirdState;
 

--
Gitblit v1.8.0