Merge branch 'sprint/185_lwr_fixMerge' into 'sprint/185'

Fix merge See merge request easycorp/zentaopms!1831
2022-02-17 03:08:20 +00:00
parent 7064d365d7 4ec144c99e
commit 959ac74bd4
1 changed files with 0 additions and 1 deletions
@@ -1,4 +1,3 @@
-=======
 ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
 ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
 ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`;