Commit 1811b96eb58581fa4b66dcb6a873969e62534a29

Authored by wangzhs
2 parents 900d12ba 693ecb28

Merge remote-tracking branch 'origin/master' into feature/mall_product

sql/mysql/optional/jimureport.mysql5.7.create.sql
@@ -1625,8 +1625,8 @@ INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070. @@ -1625,8 +1625,8 @@ INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070.
1625 -- ---------------------------- 1625 -- ----------------------------
1626 -- 多租户字段 1626 -- 多租户字段
1627 -- ---------------------------- 1627 -- ----------------------------
1628 -ALTER TABLE jimu_report_data_source  
1629 -ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER connect_times; 1628 +-- ALTER TABLE jimu_report_data_source
  1629 +-- ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER connect_times;
1630 ALTER TABLE jimu_dict 1630 ALTER TABLE jimu_dict
1631 ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER type; 1631 ADD COLUMN tenant_id varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识' AFTER type;
1632 ALTER TABLE jimu_report 1632 ALTER TABLE jimu_report