From 202fa9a2550a57311d254f928cb53aea036453fa Mon Sep 17 00:00:00 2001
From: cg33 <chg80333@163.com>
Date: Sun, 20 Dec 2020 15:04:19 +0800
Subject: [PATCH] feat(release): ready for 1.2.18

c
---
 Makefile                  | 4 ++--
 modules/system/version.go | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f2bfabd13..fe8595cca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 GOCMD = go
 GOBUILD = $(GOCMD) build
 BINARY_NAME = adm
-LAST_VERSION = v1.2.16
-VERSION = v1.2.17
+LAST_VERSION = v1.2.17
+VERSION = v1.2.18
 CLI = adm
 
 TEST_CONFIG_PATH=./../../common/config.json
diff --git a/modules/system/version.go b/modules/system/version.go
index 048678c00..15b8629b3 100644
--- a/modules/system/version.go
+++ b/modules/system/version.go
@@ -1,10 +1,10 @@
 package system
 
-const version = "v1.2.17"
+const version = "v1.2.18"
 
 var requireThemeVersion = map[string][]string{
-	"adminlte": {">=v0.0.39"},
-	"sword":    {">=v0.0.39"},
+	"adminlte": {">=v0.0.40"},
+	"sword":    {">=v0.0.40"},
 }
 
 // Version return the version of framework.