From 81cba0d06ba49eac195ab3a1773098484c8b598e Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sun, 7 Mar 2021 21:27:14 +0800
Subject: [PATCH] =?UTF-8?q?JimuReport=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A81?=
 =?UTF-8?q?.2.0=20=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                  |  4 ++--
 db/1jimureport.mysql5.7.create.sql         | 14 ++++++++++++++
 jimureport-samples/jimureport-demo/pom.xml |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e4cc201..ee828fc 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # JimuReport
 
-v1.2.0-beta | 20210305
+v1.2.0 | 20210307
 
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jimureport.com)
-[![](https://img.shields.io/badge/version-1.2.0-beta-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport)
+[![](https://img.shields.io/badge/version-1.2.0-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/JimuReport.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/JimuReport)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/JimuReport.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/JimuReport)
 
diff --git a/db/1jimureport.mysql5.7.create.sql b/db/1jimureport.mysql5.7.create.sql
index 86728e8..c995fe9 100644
--- a/db/1jimureport.mysql5.7.create.sql
+++ b/db/1jimureport.mysql5.7.create.sql
@@ -1098,4 +1098,18 @@ INSERT INTO `tmp_report_data_income` VALUES ('中石油控股或有控股权', 3
 INSERT INTO `tmp_report_data_income` VALUES ('中石油参股', 72062.45, 0.00, 0.00, 0.00, 0.00, 0.00, 72062.75);
 INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070.72, 0.00, 0.00, 0.00, 226415.09, 1698597.62);
 
+
+DROP TABLE IF EXISTS `jimu_report_link`;
+CREATE TABLE `jimu_report_link`  (
+  `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键id',
+  `report_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '积木设计器id',
+  `parameter` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数',
+  `eject_type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '弹出方式（0 当前页面 1 新窗口）',
+  `link_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '链接名称',
+  `api_method` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求方法0-get,1-post',
+  `link_type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '链接方式(0 网络报表 1 网络连接 2 图表联动)',
+  `api_url` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外网api',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '超链接配置表';
+
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/jimureport-samples/jimureport-demo/pom.xml b/jimureport-samples/jimureport-demo/pom.xml
index 089762b..8765264 100644
--- a/jimureport-samples/jimureport-demo/pom.xml
+++ b/jimureport-samples/jimureport-demo/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.jeecg</groupId>
     <artifactId>jimureport-demo</artifactId>
-    <version>1.0.2</version>
+    <version>1.2.0</version>
     <name>jimureport-demo</name>
 
     <url>http://www.jimureport.com</url>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.jimureport</groupId>
             <artifactId>spring-boot-starter-jimureport</artifactId>
-            <version>1.2.0-beta</version>
+            <version>1.2.0</version>
         </dependency>
 
         <!-- SpringBoot-->