Commit Graph
41989 Commits
Author SHA1 Message Date
lanzongjun 175b5c0669 * fix task #60360 2022-07-13 11:09:24 +08:00
lanzongjun 7637e225d4 * fix task #60360 2022-07-13 11:08:30 +08:00
王怡栋 975c7cfb3d Merge branch 'master_xieqiyu_25145' into 'master'
* Fix bug#25145.

See merge request easycorp/zentaopms!4498
2022-07-13 02:26:05 +00:00
王怡栋 0ac2e857a4 Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384

See merge request easycorp/zentaopms!4495
2022-07-13 02:25:36 +00:00
王怡栋 37e1fabe7b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix task #60360

See merge request easycorp/zentaopms!4496
2022-07-13 02:24:24 +00:00
xieqiyu cdec3750ed * Fix bug#25145. 2022-07-13 10:20:03 +08:00
孙广明 58a5567ada Merge branch 'sprint_60477' into 'master'
Sprint 60477

See merge request easycorp/zentaopms!4492
2022-07-13 02:17:41 +00:00
孙广明 1e873272b3 Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.

See merge request easycorp/zentaopms!4476
2022-07-13 02:17:12 +00:00
孙广明 3e03fa9082 Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.

See merge request easycorp/zentaopms!4494
2022-07-13 02:16:46 +00:00
lanzongjun 47aed9058f * fix task #60360 2022-07-13 10:16:07 +08:00
leiyong 5b91324e83 * Finish task#60384. 2022-07-13 02:15:09 +00:00
孙广明 d7999be8bf * Remove sprint create child btn. 2022-07-13 10:09:14 +08:00
mayue e3abe64edc * Fix bug #24930. 2022-07-13 10:03:51 +08:00
王怡栋 65e48dadb8 Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.

See merge request easycorp/zentaopms!4487
2022-07-13 02:02:44 +00:00
sunjun b905ccead6 sprint_60477 2022-07-13 01:38:10 +00:00
孙广明 f322c472f5 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476.

See merge request easycorp/zentaopms!4491
2022-07-13 01:29:02 +00:00
liumengyi 7570ab2744 * Fix bug for task #60476. 2022-07-13 09:09:35 +08:00
孙广明 28f6cefe13 * Add burn to execution list. 2022-07-13 09:00:16 +08:00
孙广明 f506169428 * Only query active task in execution list. 2022-07-13 08:54:39 +08:00
孙广明 032f5e963a * Add space to execution list. 2022-07-13 08:51:09 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
王怡栋 8f0fa110e9 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60395.

See merge request easycorp/zentaopms!4489
2022-07-13 00:44:02 +00:00
王怡栋 ae2ea79849 Merge branch 'sprint/215_tianshujie_23119' into 'master'
* Fix bug #23119.

See merge request easycorp/zentaopms!4490
2022-07-13 00:42:59 +00:00
tianshujie b68d6cca86 * Fix bug #23119. 2022-07-13 08:37:52 +08:00
liumengyi fab6829823 * Fix bug for task #60395. 2022-07-13 08:36:47 +08:00
孙广明 bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
zhouxudong adaa8667d7 * Finish task #60393. 2022-07-12 09:30:15 +00:00
孙广明 2557d4ba30 * Code for execution list. 2022-07-12 17:30:14 +08:00
王怡栋 42cd9ccc98 Merge branch 'sprint/215_tianshujie_25128' into 'master'
Sprint/215 tianshujie 25128

See merge request easycorp/zentaopms!4483
2022-07-12 09:21:23 +00:00
王怡栋 c2c5b59856 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Finish task #60478, and fix bug #24991.

See merge request easycorp/zentaopms!4486
2022-07-12 09:20:57 +00:00
王怡栋 11f2eb8a0f Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476

See merge request easycorp/zentaopms!4485
2022-07-12 09:20:31 +00:00
liumengyi d748d207fb * Optimize code. 2022-07-12 17:18:07 +08:00
liumengyi f711e0984e * Fix bug #24991. 2022-07-12 17:10:11 +08:00
leiyong 9ea1185649 * Finish task#60378. 2022-07-12 09:10:05 +00:00
liumengyi b4b41b05cb * Finish task #60478. 2022-07-12 17:09:48 +08:00
tianshujie d1ed09e9bb * Finish task #60475. 2022-07-12 16:52:02 +08:00
tianshujie 657d3fed62 * Fix bug #25128. 2022-07-12 16:21:05 +08:00
tianshujie 64151e0bef * Fix bug #25128. 2022-07-12 16:18:05 +08:00
sunjun e8dc136b0e sprint_60477 2022-07-12 08:14:48 +00:00
李玉春 e9aca4fa0d Merge branch 'sprint/wangzemei/23827' into 'master'
* Code for bug #23827

See merge request easycorp/zentaopms!4482
2022-07-12 08:11:15 +00:00
wangzemei 739758db0f * Code for bug #23827 2022-07-12 08:01:51 +00:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
王怡栋 53a977af20 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Finish task #60491.

See merge request easycorp/zentaopms!4475
2022-07-12 07:45:36 +00:00
王怡栋 d0c15d321f Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!4472
2022-07-12 07:41:56 +00:00
王怡栋 b2097b9b7c Merge branch 'sprint/215_tianshujie_60667' into 'master'
* Fix bug #25070.

See merge request easycorp/zentaopms!4480
2022-07-12 07:40:33 +00:00
王怡栋 8423bbb096 Merge branch 'sprint/215_tianshujie_60475' into 'master'
Sprint/215 tianshujie 60475

See merge request easycorp/zentaopms!4479
2022-07-12 07:39:54 +00:00
tianshujie a73cfac42c * Finish task #60475. 2022-07-12 15:33:44 +08:00
liumengyi b4ab8b5b39 * Finish task #60491. 2022-07-12 15:31:11 +08:00
zhouxudong 4e454da271 * Fix bug. 2022-07-12 07:30:01 +00:00