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/BindingAccount.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BindingAccount.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BindingAccount.java
index e46b5be..d788ebc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BindingAccount.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BindingAccount.java
@@ -1,14 +1,8 @@
package com.yeshi.fanli.entity.bus.user;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
@@ -18,34 +12,26 @@
*
* @date 2018骞�1鏈�29鏃�
*/
-@Entity
-@Table(name="yeshi_ec_binding_account")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_binding_account")
+@Table("yeshi_ec_binding_account")
public class BindingAccount {
public static final int TYPE_ALIPAY=1;
public static final int TYPE_WXPAY=2;
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="`id`")
- @Expose
- @org.yeshi.utils.mybatis.Column(name="id")
+ @Column(name="id")
private Long id;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "uid")
- @org.yeshi.utils.mybatis.Column(name="uid")
+ @Column(name="uid")
private UserInfo userInfo;
@Expose
- @org.yeshi.utils.mybatis.Column(name="account")
+ @Column(name="account")
private String account;
@Expose
- @org.yeshi.utils.mybatis.Column(name="type")
+ @Column(name="type")
private Integer type; //1.鏀粯瀹� 2.寰俊
@Expose
- @org.yeshi.utils.mybatis.Column(name="name")
+ @Column(name="name")
private String name;
public Long getId() {
--
Gitblit v1.8.0