Commit Graph
39286 Commits
Author SHA1 Message Date
zhujinyong 089eb573e1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-24 09:16:00 +08:00
zhujinyong 632c0a569c * Fix array type. 2022-05-24 09:15:44 +08:00
孙广明 7f6d251d78 Merge branch 'sprint/190_mayue_bug_#22756' into 'master'
Fix bug #22756.

See merge request easycorp/zentaopms!3551
2022-05-20 09:31:33 +00:00
孙广明 e96a1b3a58 Merge branch 'sprint/190_mayue_bug#22632' into 'master'
* Fix bug #22632.

See merge request easycorp/zentaopms!3550
2022-05-20 09:31:04 +00:00
mayue 8a1fdfe0d8 Fix bug #22756. 2022-05-20 09:29:39 +00:00
mayue 99b0f22baa * Fix bug #22632. 2022-05-20 09:10:22 +00:00
李玉春 6514b4f605 Merge branch 'sprint_sunjun_test' into 'master'
add getAssignedByMeTest

See merge request easycorp/zentaopms!3548
2022-05-20 08:26:05 +00:00
sunjun adf3ad1e97 sprint_sunjun_test 2022-05-20 08:06:30 +00:00
sunjun 990946784d add getAssignedByMeTest 2022-05-20 06:16:39 +00:00
王怡栋 7ebc461ac6 Merge branch 'master_xieqiyu_54463' into 'master'
* Finish task#54463.

See merge request easycorp/zentaopms!3544
2022-05-20 06:08:30 +00:00
王怡栋 e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
xieqiyu 063fba9ddf * Code for task#54463. Modify review code. 2022-05-20 14:03:05 +08:00
孙广明 9bbbb1289f Merge branch 'origin/sprint/192_leiyong_task_54472' into 'master'
* Finish task#54472.

See merge request easycorp/zentaopms!3546
2022-05-20 05:48:52 +00:00
孙广明 dd9e5b5b1d Merge branch 'sprint/192_leiyong_task_54490' into 'master'
* Finish task#54490.

See merge request easycorp/zentaopms!3542
2022-05-20 05:45:57 +00:00
李玉春 8e464285cf Merge branch 'fixbug_sunjun_22695' into 'master'
Fixbug sunjun 22695

See merge request easycorp/zentaopms!3545
2022-05-20 05:28:08 +00:00
sunjun 7174926385 fixbug 2022-05-20 05:25:11 +00:00
xieqiyu 1c06ae03f1 * Code for task#54463. 2022-05-20 13:18:57 +08:00
sunjun 8fe60b85d0 fixbug 2022-05-20 05:14:35 +00:00
sunjun e1acea800f fixbug_sunjun_22695 2022-05-20 05:11:52 +00:00
xieqiyu c07f0dbdab * Finish task#54463. 2022-05-20 12:37:26 +08:00
leiyong df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
李玉春 3c59f5c4a0 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
* Fix bug #22617.

See merge request easycorp/zentaopms!3540
2022-05-20 03:09:22 +00:00
李玉春 2eaf30a558 Merge branch 'fixbug_sunjun_22696' into 'master'
fixbug_sunjun_22696

See merge request easycorp/zentaopms!3539
2022-05-20 03:02:22 +00:00
sunjun ef9f67f252 fixbug 2022-05-20 02:55:37 +00:00
sunjun a466ea1c01 fixbug 2022-05-20 02:53:04 +00:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
leiyong 59a3d51ee6 * Finish task#54490. 2022-05-20 02:47:24 +00:00
tianshujie 4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
sunjun f4ff3f0491 fixbug_sunjun_22696 2022-05-20 02:34:18 +00:00
sunjun a34835e5a0 fixbug_sunjun_22696 2022-05-20 02:14:16 +00:00
孙广明 4e8ae522e4 Merge branch 'sprint/192_leiyong_task_54489' into 'master'
* Finish task#54489.

See merge request easycorp/zentaopms!3538
2022-05-20 02:01:37 +00:00
leiyong b209e48e67 * Finish task#54489. 2022-05-20 01:43:32 +00:00
孙广明 233071018d Merge branch 'mayue_add_autotest' into 'master'
* Add productplan autotest.

See merge request easycorp/zentaopms!3537
2022-05-20 01:43:17 +00:00
mayue 2622d23c31 * Optimize code. 2022-05-20 01:42:16 +00:00
孙广明 97f5dcdc9f Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555

See merge request easycorp/zentaopms!3508
2022-05-20 01:41:31 +00:00
孙广明 747a7af788 Merge branch 'sprint190_zg_54192' into 'master'
* Add project name

See merge request easycorp/zentaopms!3516
2022-05-20 01:40:18 +00:00
mayue 7f29610e0f * Add productplan autotest. 2022-05-20 01:39:21 +00:00
孙广明 74c766d89c Merge branch 'sprint/191_liumengyi_unittest' into 'master'
* Add unit test of sprint 191.

See merge request easycorp/zentaopms!3534
2022-05-20 01:37:49 +00:00
李玉春 2dc44d9fe6 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
Sprint/191 tianshujie fixbug

See merge request easycorp/zentaopms!3535
2022-05-20 01:35:06 +00:00
liyuchun 9d05eee2a0 * Fix bug #22666. 2022-05-20 01:18:12 +00:00
李玉春 125a240f4b Merge branch 'cyy_22698' into 'master'
* Fix bug #22698.

See merge request easycorp/zentaopms!3536
2022-05-20 01:07:46 +00:00
caoyanyi 53b52b7101 * Fix bug #22698. 2022-05-20 09:04:53 +08:00
tianshujie 1e65c36b18 * Modify the kanban module test case. 2022-05-20 09:00:48 +08:00
liumengyi 38c9cae3ae * Add unit test of sprint 191. 2022-05-20 08:59:20 +08:00
王怡栋 5fdd197e2c Merge branch 'sprint/master_zhouxudong_54471' into 'master'
Sprint/master zhouxudong 54471

See merge request easycorp/zentaopms!3513
2022-05-20 00:58:42 +00:00
王怡栋 857d4ce63a Merge branch 'sprint/master_zhouxudong_54478' into 'master'
* Finish task #54478.

See merge request easycorp/zentaopms!3533
2022-05-20 00:57:51 +00:00
李玉春 6c870f57c9 Merge branch 'sprint/192_leiyong_bug_22713' into 'master'
* Fix bug#22713.

See merge request easycorp/zentaopms!3532
2022-05-20 00:52:57 +00:00
tianshujie 3742cf99d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/191_tianshujie_fixbug 2022-05-20 08:40:49 +08:00
leiyong 77a180d4ad * Fix bug#22713. 2022-05-20 00:37:44 +00:00
李玉春 0fa2c55ece Merge branch 'sprint/192_leiyong_task_54488' into 'master'
* Finish task#54488.

See merge request easycorp/zentaopms!3531
2022-05-20 00:29:05 +00:00