Fix conflicts with develop branch

2020-01-17 11:27:11 -04:00
parent 6958a945bd d18bf18d33
commit 2efbb6183a
400 changed files with 7056 additions and 86309 deletions
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1162,6 +1162,8 @@ CREATE TABLE `ADDITIONAL_TABLES`
 	`ADD_TAB_TYPE` VARCHAR(32) default '',
 	`ADD_TAB_GRID` VARCHAR(256) default '',
 	`ADD_TAB_TAG` VARCHAR(256) default '',
+	`ADD_TAB_OFFLINE` TINYINT default 0 NOT NULL,
+	`ADD_TAB_UPDATE_DATE` DATETIME  NOT NULL,
 	PRIMARY KEY (`ADD_TAB_UID`),
 	KEY `indexAdditionalProcess`(`PRO_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';