Commit Graph
1287 Commits
Author SHA1 Message Date
王怡栋 561b0bdbf1 Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 09:12:01 +00:00
王怡栋 e96bea3c6c Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 09:05:19 +00:00
lanzongjun f4c8db7ed8 * fix task #53591 2022-05-10 17:02:03 +08:00
tanghucheng 9712ddcea9 Merge branch 'fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-05-10 08:54:22 +00:00
tanghucheng bd06901bfa * Fix bug. 2022-05-10 08:52:05 +00:00
唐胡成 82652aca0c Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 07:49:43 +00:00
lanzongjun 1b5b443174 * fix task #53591 2022-05-10 15:28:18 +08:00
tanghucheng fe927b1e5e * Finish task #53593. 2022-05-10 06:27:22 +00:00
wangyidong c9bc2ba86f * code for task #53592. 2022-05-10 13:48:37 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
tianshujie 6687fcdd46 * Fix bug #13146. 2022-04-27 10:48:33 +08:00
liyuchun 4c031465dc * Fix bug #22005. 2022-04-26 07:38:12 +00:00
hufangzhou 961e46d820 * Fix bug #17446. 2022-04-24 10:20:35 +08:00
田淑杰 4588b9c103 * Modify the sql statement. 2022-04-22 10:07:42 +08:00
Zongjun Lan 3b61e47ad8 * fix bug update sql 2022-04-21 14:40:33 +08:00
Zongjun Lan e2def6e71b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-21 10:13:48 +08:00
Zongjun Lan 473d5a6566 * fix bug #21853 2022-04-21 10:13:39 +08:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
王怡栋 6fdd522363 * fix for sql. 2022-04-19 16:11:26 +08:00
王怡栋 a4c8a5334e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-19 15:13:01 +08:00
王怡栋 657a8f50ef * fix bug for sql. 2022-04-19 15:12:31 +08:00
xieqiyu 205e3126ad * Fix bug#19379. 2022-04-18 15:09:49 +08:00
王怡栋 8f11396658 Merge branch 'fixbug' into 'master'
* Fix bug #17634.

See merge request easycorp/zentaopms!2962
2022-04-15 06:42:32 +00:00
tanghucheng 9761644a92 * Fix bug #17634. 2022-04-15 14:41:18 +08:00
sunjun 2a1932ebac *Fixbug_sunjun__21501 2022-04-14 13:46:17 +08:00
王怡栋 c662476270 * add index for zt_stakeholder table. 2022-04-14 10:01:46 +08:00
hufangzhou 80df716a0a * Modify the product field type of zt_action and zt_effort because the current length is not enough. 2022-04-13 16:46:55 +08:00
Zongjun Lan e13c17216a * modify sql 2022-04-13 14:48:05 +08:00
Zongjun Lan 486295dcc1 * fix bug *20169 2022-04-13 10:28:29 +08:00
Wenrui LI 54d333d800 * change zt_file.title to varchar. 2022-04-08 13:07:28 +08:00
tianshujie f4fd8bbf37 * Fix bug #21159. 2022-04-07 14:13:24 +08:00
tanghucheng b352dc9a86 * Fix bug. 2022-04-02 15:17:17 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tanghucheng c8a412287d * Fix bug . 2022-03-30 17:05:01 +08:00
tanghucheng f1449d3b6b * Fix bug. 2022-03-30 09:09:04 +08:00
liyuchun 94d0076249 * Fix error when import demo in alm. 2022-03-29 17:14:03 +08:00
zhujinyong be75d25da7 * Fix api doc. 2022-03-29 09:25:15 +08:00
tanghucheng dd13984197 * Fix bug #21211. 2022-03-28 10:42:08 +08:00
tanghucheng 447f0360c5 * Fix bug #21009,21211. 2022-03-28 10:36:22 +08:00
hufangzhou 11e151a6fa * Add the new version. 2022-03-24 10:48:05 +08:00
李玉春 e59d22f222 Merge branch 'mayue_fix_bug#20645' into 'master'
* Fix bug #20645.

See merge request easycorp/zentaopms!2427
2022-03-22 02:51:35 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
tanghucheng 3bda7c38aa * Fix bug for upgrade. 2022-03-21 16:07:03 +08:00
zenggang 70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
hufangzhou 8011a9dc0e * Fix sql. 2022-03-17 10:05:40 +08:00
zhujinyong 56c0ef9064 * Fix sql. 2022-03-16 13:38:33 +08:00
孙广明 4cc13f3b13 Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Revert code.

See merge request easycorp/zentaopms!2296
2022-03-16 05:10:42 +00:00
mayue bff6607776 * Revert code. 2022-03-16 13:05:31 +08:00
zhujinyong 489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00