From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java b/fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java
index 7a6d59b..20eb795 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java
@@ -17,7 +17,6 @@
  * @author Administrator
  *
  */
-@Entity
 @Table(name = "`yeshi_ec_monitor_data`")
 @org.yeshi.utils.mybatis.Table("yeshi_ec_monitor_data")
 public class DataMonitor {

--
Gitblit v1.8.0