From caa81d1f4dbb0f608b7a6848e673eca2c4a69d10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 五月 2021 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-generator/src/main/resources/vm/java/domain.java.vm |    3 +--
 1 files changed, 1 insertions(+), 2 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 6fd4695..b06144c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -6,9 +6,8 @@
 import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
 import java.math.BigDecimal;
+import com.ruoyi.common.annotation.Excel;
 
 /**
  * ${functionName}瀵硅薄 ${tableName}

--
Gitblit v1.9.3