From 3701161022cb6d896a6adb4206d24c6d15779b9c Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Thu, 3 Mar 2022 22:57:11 +0800
Subject: [PATCH] release: update 3.1.0

---
 CHANGELOG.en_US.md       | 14 ++++++++++++++
 CHANGELOG.md             | 14 ++++++++++++++
 CHANGELOG.zh_CN.md       | 14 ++++++++++++++
 package.json             |  2 +-
 public/serverConfig.json |  2 +-
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md
index d80d6317c..7c43f0c20 100644
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,3 +1,17 @@
+# 3.1.0 (2022-3-3)
+
+### 🎫 Feat
+
+- iframe supports dynamic loading
+- Watermark example
+- Print examples (pictures, tables, echarts)
+- Add running and packaging information, use `lodash-unified` to replace `lodash-es`, `lodash-unified` supports `ESM` and is compatible with `CJS`
+
+### 🐞 Bug fixes
+
+- Fixed jumping to another menu page alone in one menu page, the routing page jumped but the tab page was not displayed
+- Fixed the route that returns dynamic level 3 and above in the background, and the menu does not correspond to the page
+
 # 3.0 (2022-2-14)
 
 ### 🎫 Feat
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d80d6317c..7c43f0c20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# 3.1.0 (2022-3-3)
+
+### 🎫 Feat
+
+- iframe supports dynamic loading
+- Watermark example
+- Print examples (pictures, tables, echarts)
+- Add running and packaging information, use `lodash-unified` to replace `lodash-es`, `lodash-unified` supports `ESM` and is compatible with `CJS`
+
+### 🐞 Bug fixes
+
+- Fixed jumping to another menu page alone in one menu page, the routing page jumped but the tab page was not displayed
+- Fixed the route that returns dynamic level 3 and above in the background, and the menu does not correspond to the page
+
 # 3.0 (2022-2-14)
 
 ### 🎫 Feat
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index a0fd8240a..e8c1bf803 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,17 @@
+# 3.1.0 (2022-3-3)
+
+### 🎫 Feat
+
+- iframe 支持动态加载
+- 水印示例
+- 打印示例（图片、表格、echarts）
+- 添加运行、打包信息, 使用`lodash-unified`替换`lodash-es`,`lodash-unified`支持`ESM`同时兼容`CJS`
+
+### 🐞 Bug fixes
+
+- 修复在一个菜单页面内单独跳转到另一个菜单页面，路由页面跳转了但是标签页不显示的情况
+- 修复后台返回动态三级及以上的路由，出现菜单与页面不对应的情况
+
 # 3.0 (2022-2-14)
 
 ### 🎫 Feat
diff --git a/package.json b/package.json
index 5533835e3..19608790f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "3.0",
+  "version": "3.1.0",
   "private": true,
   "scripts": {
     "dev": "cross-env --max_old_space_size=4096 vite",
diff --git a/public/serverConfig.json b/public/serverConfig.json
index 51ea669a5..aa52a7c3b 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.0",
+  "Version": "3.1.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,