Commit Graph
39343 Commits
Author SHA1 Message Date
王怡栋 6cc66fad4f Merge branch 'sprint/180beta1_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!6197
2022-11-16 07:29:23 +00:00
王怡栋 53afef4a2c Merge branch 'sprint/feedback1441' into 'master'
Sprint/feedback1441

See merge request easycorp/zentaopms!6196
2022-11-16 07:28:29 +00:00
王怡栋 b87eee11ec Merge branch 'zentaopms_258_bug#29666' into 'master'
* Fix bug #29666.

See merge request easycorp/zentaopms!6191
2022-11-16 07:28:07 +00:00
王怡栋 6f485d3797 Merge branch 'zentaopms_261_release_linkstory' into 'master'
* Get stories of project build when link story.

See merge request easycorp/zentaopms!6193
2022-11-16 07:27:18 +00:00
王怡栋 e969873a84 Merge branch 'zentaopms_258_bug#29692' into 'master'
* Fix bug #29692.

See merge request easycorp/zentaopms!6190
2022-11-16 07:26:48 +00:00
王怡栋 dfbe3f202e Merge branch 'zentaopms_258_bug#29704' into 'master'
* Fix bug #29704.

See merge request easycorp/zentaopms!6189
2022-11-16 07:26:31 +00:00
王怡栋 9e0c3de9da Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change story

See merge request easycorp/zentaopms!6188
2022-11-16 07:26:11 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
chaideqing 3c4ee4bf5a * Fix feedback1441 another file. 2022-11-16 13:59:07 +08:00
lanzongjun a628acfd0b fix code error 2022-11-16 13:52:56 +08:00
daitingting f321bc24d8 * Get stories of project build when link story. 2022-11-16 05:36:35 +00:00
wangyuting 5771eac9c8 * Fix bug #29666. 2022-11-16 05:34:42 +00:00
wangyuting eb8f8bac5e * Fix bug #29692. 2022-11-16 05:29:40 +00:00
wangyuting 594e24f884 * Fix bug #29704. 2022-11-16 05:19:19 +00:00
王怡栋 9470e2ca69 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-16 13:08:15 +08:00
王怡栋 2bb3cd3371 Merge branch 'fixbug' 2022-11-16 13:08:00 +08:00
王怡栋 1a4d187866 Merge branch 'zentaopms261_wyd' into 'master'
* fix bug #29733.

See merge request easycorp/zentaopms!6187
2022-11-16 05:06:13 +00:00
王怡栋 29c32632c0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-16 13:04:58 +08:00
王怡栋 d3e3335599 * fix bug #29727. 2022-11-16 13:03:50 +08:00
lanzongjun 9e0ac41d78 change story 2022-11-16 11:31:21 +08:00
tanghucheng 3ce0869e1a * Replace '' to helper::dbIN for release linkStory. 2022-11-16 11:28:40 +08:00
王怡栋 f2acb4f648 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #76394#76402

See merge request easycorp/zentaopms!6181
2022-11-16 03:16:58 +00:00
王怡栋 8b1146e5d1 Merge branch 'zentaopms_258_bug#29705' into 'master'
* Fix bug #29705.

See merge request easycorp/zentaopms!6183
2022-11-16 03:14:48 +00:00
王怡栋 cc1300242b Merge branch 'zentaopms_258_bug#29708' into 'master'
* Fix bug #29708.

See merge request easycorp/zentaopms!6182
2022-11-16 03:14:31 +00:00
chaideqing 197fcd24c3 * Fix feedback #1441. 2022-11-16 11:10:20 +08:00
王怡栋 e04c30fa3b * fix bug #29733. 2022-11-16 11:00:44 +08:00
tanghucheng 47398d1cf0 * Fix bug #29869. 2022-11-16 10:52:53 +08:00
lanzongjun 22fe166499 * finish task #76402 2022-11-16 10:36:12 +08:00
wangyuting 61438d05cb * Fix bug #29705. 2022-11-16 02:34:34 +00:00
wangyuting d6488a7e0f * Fix bug #29708. 2022-11-16 02:29:06 +00:00
lanzongjun bbee9eedca * finish task #76394 2022-11-16 10:26:10 +08:00
王怡栋 fabf2f3713 Merge branch 'feedback_1452' into 'master'
* Fix feedback#1452

See merge request easycorp/zentaopms!6172
2022-11-16 02:21:33 +00:00
孙广明 e656871dcf Merge branch 'master_xieqiyu_29860' into 'master'
* Fix bug#29860.

See merge request easycorp/zentaopms!6180
2022-11-16 02:21:28 +00:00
xieqiyu 930e378c0a * Fix bug#29860. 2022-11-16 10:18:25 +08:00
zenggang 1c69f30793 * Adjust code 2022-11-16 02:08:00 +00:00
王怡栋 83cfa5262d Merge branch 'zentaopms_258_bug#29825' into 'master'
* Fix bug #29825.

See merge request easycorp/zentaopms!6179
2022-11-16 02:05:44 +00:00
王怡栋 3efbabf0f6 Merge branch 'zentaopms_261_bug_#29851' into 'master'
* Fix bug #29851.

See merge request easycorp/zentaopms!6177
2022-11-16 02:04:30 +00:00
王怡栋 5a11d47992 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75921

See merge request easycorp/zentaopms!6176
2022-11-16 02:04:10 +00:00
王怡栋 b328b219e5 Merge branch 'cyy_bug_29839' into 'master'
* Fix bug #29839.

See merge request easycorp/zentaopms!6175
2022-11-16 02:02:46 +00:00
王怡栋 d63c39bc59 Merge branch 'master_xieqiyu_code' into 'master'
* Modify code of review.

See merge request easycorp/zentaopms!6174
2022-11-16 02:02:04 +00:00
王怡栋 2dd61a2a2c Merge branch 'zentaopms_258_bug#29840' into 'master'
* Fix bug #29840.

See merge request easycorp/zentaopms!6171
2022-11-16 02:00:09 +00:00
王怡栋 ecb1815b3d Merge branch 'master_xieqiyu_76331' into 'master'
* Fix bug#29730.

See merge request easycorp/zentaopms!6170
2022-11-16 01:59:20 +00:00
王怡栋 fc592d33d2 Merge branch 'fixbug' into 'master'
* Fix bug #29820.

See merge request easycorp/zentaopms!6169
2022-11-16 01:58:37 +00:00
王怡栋 567cefa44e Merge branch 'zentaopms_258_bug#29712' into 'master'
* Fix bug #29712.

See merge request easycorp/zentaopms!6168
2022-11-16 01:56:20 +00:00
王怡栋 5ae28179c6 Merge branch 'zentaopms_258_bug#29720' into 'master'
* Fix bug #29720.

See merge request easycorp/zentaopms!6167
2022-11-16 01:55:36 +00:00
王怡栋 5dcbebeaf1 Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6178
2022-11-16 01:54:53 +00:00
wangyuting f055b3ffc0 * Fix bug #29825. 2022-11-16 01:54:15 +00:00
王怡栋 62312f55b8 * fix bug #29798. 2022-11-16 09:53:17 +08:00
daitingting ad8a809384 * Fix bug #29851. 2022-11-16 01:45:04 +00:00
王怡栋 14edb87de2 * fix bug #29675. 2022-11-16 09:38:55 +08:00