From f5e011789d0e68cb651a1436ef846f55bfb2d493 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Fri, 25 Jun 2021 17:50:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-core-api/pom.xml          |   2 +-
 modules/i3plus-core-apiservice/.DS_Store | Bin 0 -> 6148 bytes
 modules/i3plus-core-apiservice/pom.xml   |   2 +-
 pom.xml                                  |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 modules/i3plus-core-apiservice/.DS_Store

diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml
index 42c86a0..d202ba1 100644
--- a/modules/i3plus-core-api/pom.xml
+++ b/modules/i3plus-core-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-core-apiservice/.DS_Store b/modules/i3plus-core-apiservice/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ee771938787a1bb39cadddab0eb4f7463f2ead2b
GIT binary patch
literal 6148
zcmeHKI|>3Z5S>vG!N$@uSMUZw^aOhW1;s`bM6I{-TprCgpGH?ZZR8D1UNV`NkXP*N
zh=|TFo0-T&L`HB!x!KS)+c)o6FCz+s<BYAGug&SOKOT0S?DqlV4&^LsImzyYZ+kQ<
zKn17(6`%rC;JXTBeI1Rzdn`|*0#x7+6tM3@fg9GuHqbvE7`z1l4iI+3+<OUNu>i0p
zwt<MiG^oI!YPJ{}bi_;M)x<V1=%U$tXx^;Zp{U=E^NXj8)<BL_fC@Y-(2wQB>i-h{
zq5pp-aYY5Fz+Wk#gGIBL<4IXtJCCzkTi`3W<=o+Bm^%f7mt&xpV=Sy3PdzE}ip{ZK
V6Wc(iBkpt{e+En!8Ws4p0uNe26{i3I

literal 0
HcmV?d00001

diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index f6d2309..32d5312 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 347af6b..8d4473b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>i3plus.core</groupId>
     <artifactId>i3plus-core</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-core-api</module>
         <module>modules/i3plus-core-apiservice</module>

From 004346de514545535919b730e3d886f6cef621e4 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Fri, 25 Jun 2021 18:44:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4.DS=5FSTORE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-core-apiservice/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 modules/i3plus-core-apiservice/.DS_Store

diff --git a/modules/i3plus-core-apiservice/.DS_Store b/modules/i3plus-core-apiservice/.DS_Store
deleted file mode 100644
index ee771938787a1bb39cadddab0eb4f7463f2ead2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKI|>3Z5S>vG!N$@uSMUZw^aOhW1;s`bM6I{-TprCgpGH?ZZR8D1UNV`NkXP*N
zh=|TFo0-T&L`HB!x!KS)+c)o6FCz+s<BYAGug&SOKOT0S?DqlV4&^LsImzyYZ+kQ<
zKn17(6`%rC;JXTBeI1Rzdn`|*0#x7+6tM3@fg9GuHqbvE7`z1l4iI+3+<OUNu>i0p
zwt<MiG^oI!YPJ{}bi_;M)x<V1=%U$tXx^;Zp{U=E^NXj8)<BL_fC@Y-(2wQB>i-h{
zq5pp-aYY5Fz+Wk#gGIBL<4IXtJCCzkTi`3W<=o+Bm^%f7mt&xpV=Sy3PdzE}ip{ZK
V6Wc(iBkpt{e+En!8Ws4p0uNe26{i3I


From 558f2c4a61e6d33cb971316a78cda51cbf9c1ab0 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Mon, 28 Jun 2021 13:05:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
index c03fc30..7bc7fec 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
@@ -416,7 +416,7 @@ public class SysMenuController extends CrudBaseController<SysMenu> {
             file.createNewFile();
             File excle = excelTool.exportData(file, list, SysMenu.class, new String[]{
                     "menuCode", "name","parentId","menuType","softType","menuStatus","parentNameRdd","menuUrl","menuClassPath","menuGrade","menuSort"
-                    ,"menuCss","menuIcon","menuDescription"
+                    ,"menuCss","menuIcon","menuDescription","menuBackgroundImage"
             });
 
             response.setContentType("application/force-download"); // 设置强制下载不打开

From d39b9cbe7c8c3c5419f88f83c726a32aa932018e Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Mon, 28 Jun 2021 13:10:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-core-api/pom.xml        | 2 +-
 modules/i3plus-core-apiservice/pom.xml | 2 +-
 pom.xml                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml
index d202ba1..42c86a0 100644
--- a/modules/i3plus-core-api/pom.xml
+++ b/modules/i3plus-core-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 32d5312..f6d2309 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 8d4473b..347af6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>i3plus.core</groupId>
     <artifactId>i3plus-core</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-core-api</module>
         <module>modules/i3plus-core-apiservice</module>