sql code sync

sql/update.sql

@@ -50,7 +50,6 @@ ADD COLUMN `contract_expr`  varchar(255) CHARACTER SET ascii COLLATE ascii_gener
 
 ALTER TABLE `zh_project_account` ADD `backdoor_password` VARCHAR(255) NULL DEFAULT NULL COMMENT '副密码' AFTER `password`;
 
-<<<<<<< HEAD
 CREATE TABLE `calculation`.`zh_rpt_tree_node_cust` (
   `id` INT NOT NULL AUTO_INCREMENT,
   `cust_acc_id` VARCHAR(50) NULL COMMENT '用户的SSO account id',
@@ -58,11 +57,9 @@ CREATE TABLE `calculation`.`zh_rpt_tree_node_cust` (
   PRIMARY KEY (`id`),
   INDEX `cust_acc` (`cust_acc_id` ASC))
 COMMENT = '报表模板节点的用户定制化显示';
-=======
+
 ALTER TABLE `zh_project` ADD `page_show` VARCHAR(5000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '前台页面或功能展示与隐藏' AFTER `secret`;
 
 ALTER TABLE `zh_project` CHANGE `creator` `creator` INT(11) NOT NULL COMMENT '创建者';
 
 INSERT INTO `zh_permission`(`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES (71,'页面显示','project','pageshow',38,'',NULL,1)
-
->>>>>>> 8a639d20203b267d6b190da092a44493b979926b