From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误

---
 ruoyi-generator/src/main/resources/vm/java/domain.java.vm |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index b6eca82..5832be6 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -7,7 +7,6 @@
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
 
 /**
  * ${functionName}瀵硅薄 ${tableName}

--
Gitblit v1.9.3