From ca5a265934bfb864c927d7aaec3aa8b4ee0e750e Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Mon, 11 Jul 2022 11:09:45 +0800 Subject: [PATCH] =?UTF-8?q?1.5.1=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 | 8 ++++---- db/jimureport.mysql5.7.create.sql | 11 +++++++++++ jimureport-example/db/jimureport.mysql5.7.create.sql | 10 ++++++++++ jimureport-example/pom.xml | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1a133b4..9d40768 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # JimuReport - 积木报表（一款免费Web报表工具） -v1.5.0 | 2022-05-26 +v1.5.1 | 2022-07-11 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jimureport.com) -[![](https://img.shields.io/badge/version-1.5.0-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport) +[![](https://img.shields.io/badge/version-1.5.1-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) @@ -43,7 +43,7 @@ v1.5.0 | 2022-05-26 org.jeecgframework.jimureport jimureport-spring-boot-starter - 1.5.0 + 1.5.1 ``` @@ -53,7 +53,7 @@ v1.5.0 | 2022-05-26 org.jeecgframework.jimureport jimureport-spring-boot-starter - 1.5.0 + 1.5.1 minidao-spring-boot-starter diff --git a/db/jimureport.mysql5.7.create.sql b/db/jimureport.mysql5.7.create.sql index 1524986..4dbc4e0 100644 --- a/db/jimureport.mysql5.7.create.sql +++ b/db/jimureport.mysql5.7.create.sql @@ -1619,4 +1619,15 @@ 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); +-- ---------------------------- +-- 多租户字段 +-- ---------------------------- +ALTER TABLE jimu_report_data_source +ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER connect_times; +ALTER TABLE jimu_dict +ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER type; +ALTER TABLE jimu_report +ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '多租户标识' AFTER js_str; + + SET FOREIGN_KEY_CHECKS = 1; diff --git a/jimureport-example/db/jimureport.mysql5.7.create.sql b/jimureport-example/db/jimureport.mysql5.7.create.sql index b707237..07f2704 100644 --- a/jimureport-example/db/jimureport.mysql5.7.create.sql +++ b/jimureport-example/db/jimureport.mysql5.7.create.sql @@ -1622,4 +1622,14 @@ 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); +-- ---------------------------- +-- 多租户字段 +-- ---------------------------- +ALTER TABLE jimu_report_data_source +ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER connect_times; +ALTER TABLE jimu_dict +ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER type; +ALTER TABLE jimu_report +ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '多租户标识' AFTER js_str; + SET FOREIGN_KEY_CHECKS = 1; diff --git a/jimureport-example/pom.xml b/jimureport-example/pom.xml index 6dc3f7a..aa69bee 100644 --- a/jimureport-example/pom.xml +++ b/jimureport-example/pom.xml @@ -37,7 +37,7 @@ - 1.5.0 + 1.5.1 1.8 8.0.3