Commit Graph
34623 Commits
Author SHA1 Message Date
王怡栋 7f89cbb52e Merge branch 'sprint/tianshujie_issue' into 'master'
Sprint/tianshujie issue

See merge request easycorp/zentaopms!4510
2022-07-13 05:35:22 +00:00
王怡栋 e286a450fb Merge branch 'sprint/215_liumengyi_24491' into 'master'
* Fix bug #24491.

See merge request easycorp/zentaopms!4504
2022-07-13 05:33:00 +00:00
王怡栋 ac29fee89d Merge branch 'sprint/214_hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!4508
2022-07-13 05:32:31 +00:00
孙广明 61125b78b5 Merge branch 'sprint/216_mayue_bug24404' into 'master'
Sprint/216 mayue bug24404

See merge request easycorp/zentaopms!4507
2022-07-13 05:29:18 +00:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
tianshujie 66b29f2881 * Resolve issue #690. 2022-07-13 13:23:13 +08:00
tianshujie 7ce105940e * Resolve issue #690. 2022-07-13 13:17:02 +08:00
孙广明 d8e313669e Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474

See merge request easycorp/zentaopms!4503
2022-07-13 05:10:46 +00:00
liumengyi cc31e0efa0 * Fix bug #24491. 2022-07-13 13:09:30 +08:00
sunjun 0c7767c3c5 60474 2022-07-13 04:31:32 +00:00
mayue 3cfa290a92 * Fix bug #24404. 2022-07-13 11:31:57 +08:00
王怡栋 ec135f3c40 Merge branch 'sprint/215_liumengyi_24896' into 'master'
* Fix bug #24896.

See merge request easycorp/zentaopms!4501
2022-07-13 03:29:41 +00:00
王怡栋 a769590829 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4502
2022-07-13 03:29:11 +00:00
tianshujie c52fc59335 * Fix bug #25072. 2022-07-13 11:26:59 +08:00
liumengyi 424653ac7f * Fix bug #24896. 2022-07-13 11:23:50 +08:00
王怡栋 aa81fd6741 Merge branch 'sprint214_leiyong_fix_bug' into 'master'
* Adjust Modified Fields.

See merge request easycorp/zentaopms!4499
2022-07-13 03:12:56 +00:00
王怡栋 30e7879a41 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4493
2022-07-13 03:12:44 +00:00
lanzongjun 818bd7085c * fix task #60360 2022-07-13 11:11:57 +08:00
mayue 090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
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
leiyong accd4feee5 * Adjust Modified Fields. 2022-07-13 02:57:28 +00: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
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
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
liumengyi be11f49b45 * Optimize code. 2022-07-13 09:46:02 +08: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
tianshujie 38325e32a8 * Fix bug #22964. 2022-07-13 09:05:36 +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
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