Commit Graph
47741 Commits
Author SHA1 Message Date
王怡栋 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
caoyanyi 41ecdd3e89 * Modify severity style. 2022-11-16 10:00:57 +08: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
caoyanyi 4d90d01042 * Fix bug #29835. 2022-11-16 09:38:27 +08:00
lanzongjun b18918ad22 * finish task #75921 2022-11-16 09:36:11 +08:00
lanzongjun 2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
caoyanyi b2adb6ab92 * Fix bug #29839. 2022-11-16 09:32:02 +08:00
zenggang 921de5b4f1 * Fix feedback#1452 2022-11-16 01:13:55 +00:00
wangyuting b441fd0a4c * Fix bug #29840. 2022-11-16 01:13:08 +00:00
xieqiyu ad6a5c5524 * Fix bug#29730. 2022-11-16 09:04:52 +08:00
tanghucheng d626bfbaef * Fix bug #29820. 2022-11-16 08:49:31 +08:00
wangyuting 8270dc9ab2 * Fix bug #29712. 2022-11-15 09:57:19 +00:00
wangyuting 6a204a32c0 * Fix bug #29720. 2022-11-15 09:35:10 +00:00
xieqiyu 28ef479910 * Modify code of review. 2022-11-15 17:16:30 +08:00
王怡栋 6fc2d1bd23 Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.

See merge request easycorp/zentaopms!6160
2022-11-15 08:31:10 +00:00
王怡栋 591a79487b Merge branch 'zentaopms_261_kanban_import_release' into 'master'
* Adjust import release list.

See merge request easycorp/zentaopms!6166
2022-11-15 08:30:49 +00:00
王怡栋 35013a4844 Merge branch 'sprint/master_lanzongjun_fixbug' 2022-11-15 16:27:34 +08:00
王怡栋 ab5e0d9b4a Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/execution/control.php
2022-11-15 08:26:48 +00:00
daitingting cc12e45755 g * Adjust import release list. 2022-11-15 08:26:43 +00:00
liuhong 13c945cd07 * Adjust code feedback #1422. 2022-11-15 08:26:11 +00:00
王怡栋 6e844601d1 Merge branch 'zentaopms_261_bug_#29623' into 'master'
* Fix bug #29623.

See merge request easycorp/zentaopms!6162
2022-11-15 08:22:28 +00:00
王怡栋 1890c90011 Merge branch 'zentaopms_258_bug#29694' into 'master'
* Fix bug #29694.

See merge request easycorp/zentaopms!6161
2022-11-15 08:18:56 +00:00
王怡栋 a3329783e3 Merge branch 'zentaopms_258_bug#29735' into 'master'
* Fix bug #29735.

See merge request easycorp/zentaopms!6158
2022-11-15 08:15:50 +00:00
王怡栋 bcf50feeaa Merge branch 'zentaopms_258_bug#29759' into 'master'
* Fix bug #29759.

See merge request easycorp/zentaopms!6156
2022-11-15 08:15:27 +00:00
孙广明 093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
孙广明 9fff01e2bf Merge branch 'master_xieqiyu_75907' into 'master'
* Fix bug#29445.

See merge request easycorp/zentaopms!6146
2022-11-15 08:13:11 +00:00
孙广明 3aedd173f8 Merge branch 'master_xieqiyu_29808' into 'master'
* Fix bug#29808.

See merge request easycorp/zentaopms!6165
2022-11-15 07:57:42 +00:00
xieqiyu 85c8e84c79 * Fix bug#29808. 2022-11-15 15:56:34 +08:00
孙广明 d18d4c8a44 Merge branch 'sprint/zentaopms262_mayue_bug#29682' into 'master'
* Fix bug #29682.

See merge request easycorp/zentaopms!6157
2022-11-15 07:55:33 +00:00
孙广明 d9a22dd22f Merge branch 'sprint/zentaopms262_mayue_bug#29757' into 'master'
* Fix bug #29757.

See merge request easycorp/zentaopms!6152
2022-11-15 07:54:50 +00:00
孙广明 b7d1be8bc6 Merge branch 'sprint/zentaopms262_mayue_bug#29725' into 'master'
* Fix bug #29725.

See merge request easycorp/zentaopms!6164
2022-11-15 07:54:18 +00:00
孙广明 63db685dc5 Merge branch 'sprint/zentaopms262_mayue_bug#29741' into 'master'
* Fix bug #29741.

See merge request easycorp/zentaopms!6149
2022-11-15 07:53:43 +00:00
lanzongjun df7841c7b7 * finish task #75920 2022-11-15 15:50:05 +08:00