From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
index 562b663..ae01e94 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
@@ -11,7 +11,6 @@
 import com.google.gson.annotations.Expose;
 
 //鍋囩敤鎴�
-@Entity
 @Table(name = "yeshi_ec_sham_user")
 @org.yeshi.utils.mybatis.Table("yeshi_ec_sham_user")
 public class ShamUser {

--
Gitblit v1.8.0