From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 17 九月 2019 09:45:50 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java index 2badbad..e7ce9a7 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java @@ -1,10 +1,5 @@ package com.yeshi.fanli.entity.bus.user; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; import javax.persistence.Transient; import org.yeshi.utils.mybatis.Column; @@ -33,8 +28,6 @@ public final static int TYPE_TAOBAO = 1; - @Id - @GeneratedValue(strategy = GenerationType.AUTO) @Expose @Column(name = "id") private Long id; @@ -55,14 +48,10 @@ private Long handleTime; @Column(name = "uid") - @ManyToOne - @JoinColumn(name = "uid") @Expose private UserInfo userInfo; @Column(name = "oid") - @ManyToOne - @JoinColumn(name = "oid") @Expose private Order order; @Column(name = "remake") @@ -73,7 +62,6 @@ private String judge;// 绯荤粺鍒ゅ畾锛氬鏋滅敤鎴峰湪鏈郴缁熻喘涔板苟鎴愬姛涓婁紶杩囪鍗曪紝涓斾笂浼犵殑涓㈠け璁㈠崟鍚�6浣嶇浉鍚岀殑璇濓紝閭ｄ箞绯荤粺鍒ゅ畾涓哄尮閰� @Column(name = "result_code") - @javax.persistence.Column(name = "result_code") @Expose private Integer resultCode;// 绗笁鏂瑰钩鍙拌鍗曠埇鍙栫粨鏋� @Column(name = "ip_info") -- Gitblit v1.8.0