Commit Graph
3188 Commits
Author SHA1 Message Date
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
Yagami 46661419f6 * Code for stage path. 2023-03-03 09:59:15 +08:00
Yagami 1ce1a24f1d * Fix execution-stage list bug. 2023-03-02 17:40:47 +08:00
liumengyi 285dcf409b * Fix bug #32513. 2023-03-02 07:56:48 +00:00
liumengyi 17bc1bfacc * Fix bug #32592. 2023-03-02 07:47:56 +00:00
孙广明 50ece3fadf Merge branch 'fixbug_liumengyi_32588' into 'master'
* Fix bug #32513.

See merge request easycorp/zentaopms!7131
2023-03-02 07:37:29 +00:00
liumengyi ee007fe1f6 * Fix bug #32513. 2023-03-02 07:35:35 +00:00
孙广明 7989ef5e0f Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7128
2023-03-02 05:51:27 +00:00
tianshujie bf3081471d * Optimized creating requirements page. 2023-03-02 13:48:04 +08:00
tianshujie 89db51f678 * Code for fix bug 32562. 2023-03-02 13:30:19 +08:00
tianshujie aba725ef30 * Code for fix bug 32562. 2023-03-02 13:12:55 +08:00
liumengyi f898b790ef * Fix bug #32588. 2023-03-02 03:23:59 +00:00
王怡栋 8aceed5e5a Merge branch 'sprint/hufangzhou_formatcode' into 'master'
* Format the code and remove type restriction when batch change execution's status.

See merge request easycorp/zentaopms!7112
2023-03-01 10:15:45 +00:00
孙广明 7631bf7b80 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug #32558.

See merge request easycorp/zentaopms!7115
2023-03-01 09:15:21 +00:00
孙广明 db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
liumengyi aa7540d163 * Fix bug #32558. 2023-03-01 08:47:10 +00:00
tianshujie f159017f45 * Code for fix bug #32562. 2023-03-01 16:22:34 +08:00
liumengyi 9567ecadfb * Fix bug of check date. 2023-03-01 08:11:25 +00:00
孙广明 f4d8409742 Merge branch 'fixbug_liumengyi_32559' into 'master'
* Fix bug 32558.

See merge request easycorp/zentaopms!7111
2023-03-01 07:50:35 +00:00
孙广明 65884c2dd9 Merge branch 'fixbug_liumengyi_32423' into 'master'
* Fix bug  32423 32540 32157.

See merge request easycorp/zentaopms!7110
2023-03-01 07:49:18 +00:00
hufangzhou e89d668fc5 * Format the code and remove type restriction when batch change execution's status. 2023-03-01 07:44:23 +00:00
liumengyi fcf2ca081f * Fix bug #32559. 2023-03-01 07:44:17 +00:00
liumengyi ba064c9aa8 * Fix bug #32559. 2023-03-01 07:05:35 +00:00
Yagami 9fe8ffa4af Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-01 14:48:22 +08:00
Yagami 97c421c5b4 * Fix bug #32374. 2023-03-01 14:48:12 +08:00
liumengyi 2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
孙广明 cef80a4330 Merge branch 'sprint/hufangzhou_fixbug_32533' into 'master'
* Fix bug #32533.

See merge request easycorp/zentaopms!7107
2023-03-01 06:34:02 +00:00
孙广明 630e1eb570 Merge branch 'wxp_bug85658_' into 'master'
* Fix bug #85658.

See merge request easycorp/zentaopms!7108
2023-03-01 06:33:47 +00:00
孙广明 dc4027286e Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32513.

See merge request easycorp/zentaopms!7106
2023-03-01 06:33:24 +00:00
wangxuepeng 9c840db309 * Fix bug #85658. 2023-03-01 06:25:32 +00:00
wangxuepeng 01cfe5655b * Finish task #85658. 2023-03-01 06:16:25 +00:00
hufangzhou c262a060bd * Fix bug #32533. 2023-03-01 05:32:58 +00:00
liumengyi 951e4a09e1 * Fix bug #32513. 2023-03-01 05:06:42 +00:00
王怡栋 9f2dc5d215 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7101
2023-03-01 03:06:37 +00:00
tianshujie 707bc8cbda * Code for fix bug #32522. 2023-03-01 10:41:57 +08:00
hufangzhou e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +00:00
zhujinyong e0bb071d99 * Fix bug #32339. 2023-03-01 08:52:19 +08:00
王怡栋 4f6e7cbe34 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7096
2023-03-01 00:32:32 +00:00
王怡栋 97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00
孙广明 c9a7c22553 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug 32493 32502 32495 32494 32491.

See merge request easycorp/zentaopms!7092
2023-02-28 09:12:43 +00:00
tianshujie 0f7d855f3e * Code for fix bug #32511. 2023-02-28 17:05:37 +08:00
tianshujie 797c0befa2 * Code for fix bug #32505. 2023-02-28 17:03:09 +08:00
Yagami 7ca8fbffb4 * Fix code error. 2023-02-28 16:22:59 +08:00
liumengyi adba207640 * Fix bug #32502. 2023-02-28 08:07:03 +00:00
liumengyi 1c5578745b * Fix bug #32493. 2023-02-28 07:56:21 +00:00
孙广明 54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
xieqiyu 23518e36fd * Code for bug#32489. 2023-02-28 14:33:43 +08:00
Yagami abc8bf2788 * Fix bug #32450. 2023-02-28 14:16:29 +08:00
liumengyi cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
liumengyi d480741a01 * Fix bug of computeProgress. 2023-02-28 05:17:52 +00:00