Commit Graph
3772 Commits
Author SHA1 Message Date
王怡栋 939089b325 Merge branch 'sprint/fixbug_tanghucheng' into 'master'
* Fix bug #25334.

See merge request easycorp/zentaopms!6836
2023-02-02 05:45:48 +00:00
鲁飞 741917d2ab * Fix compatible error. 2023-02-02 03:46:31 +00:00
tanghucheng e001f2a00b * Fix bug #25334. 2023-02-02 09:42:45 +08:00
tanghucheng 61c09d7c32 * Fix bug #29989. 2023-02-02 08:43:52 +08:00
xieqiyu 770750c9db * Fix bug#30144. 2023-02-01 16:23:59 +08:00
孙广明 fd06ece2f1 Merge branch 'songpeiyan_bug#30079' into 'master'
Songpeiyan bug#30079

See merge request easycorp/zentaopms!6825
2023-02-01 07:57:41 +00:00
songpeiyan bfa6c4bd29 Fix bug #30079 2023-02-01 15:48:45 +08:00
songpeiyan b1d3eb75f8 *Fix bug #30079 2023-02-01 15:41:00 +08:00
songpeiyan f8eba3cc9b * Fix bug #31558. 2023-02-01 14:30:43 +08:00
wangyuting2 b4efdef521 * Optimize code. 2023-01-31 08:25:31 +08:00
wangyuting2 88b0a68ee0 * Send an email to the dispatcher when closing a bug or requirement. 2023-01-30 15:41:50 +08:00
tianshujie 7ca322300b * Fix bug #25848. 2023-01-29 16:21:42 +08:00
tianshujie dec6df72b2 * Fix bug #25848. 2023-01-29 16:15:06 +08:00
tianshujie 30ed2fd65c * Fix bug #25848. 2023-01-29 15:58:48 +08:00
xieqiyu 5c84bf67bf * Fix bug#30850. 2023-01-18 16:31:08 +08:00
xieqiyu 9a64cf0e50 * Fix bug#30964. 2023-01-18 16:00:17 +08:00
xieqiyu 67a4f16f74 * Fix bug#31685. 2023-01-18 15:12:14 +08:00
xieqiyu f5e68c045e * Fix bug#31708. 2023-01-17 10:00:03 +08:00
孙广明 9554414096 Merge branch 'master_bug_27671' into 'master'
* Fix bug #27671.

See merge request easycorp/zentaopms!6766
2023-01-13 08:35:07 +00:00
liuhong 2b48e98222 * Fix bug #27671. 2023-01-13 06:47:07 +00:00
孙广明 b21a9be30e Merge branch 'master_bug_28243' into 'master'
* Fix bug #28243.

See merge request easycorp/zentaopms!6761
2023-01-13 06:12:56 +00:00
liuhong fe80314c6a * Fix bug #30816. 2023-01-13 03:29:21 +00:00
liuhong 90b524a6d9 * Fix bug #28243. 2023-01-13 02:12:01 +00:00
xieqiyu 9bd57aa0d4 * Fix bug#31581. 2023-01-11 15:59:30 +08:00
mayue a074537835 * Resolve feedback #1941. 2023-01-10 13:07:38 +08:00
王怡栋 7fe559597f Merge branch 'zentaopms_283_fix_task_#82075' into 'master'
* Finish task #82075.

See merge request easycorp/zentaopms!6729
2023-01-09 00:25:09 +00:00
王怡栋 0b625878de Merge branch 'master' into 'zentaopms_283_task_#82064'
# Conflicts:
#   module/story/view/view.html.php
2023-01-09 00:23:49 +00:00
daitingting 40f8690b60 * Finish task #82075. 2023-01-08 02:29:13 +00:00
daitingting 903cfc57ac * Finish task #82064. 2023-01-06 09:15:42 +00:00
王怡栋 b6f3986894 Merge branch 'zentaopms_283' into 'master'
Zentaopms 283

See merge request easycorp/zentaopms!6725
2023-01-06 08:31:14 +00:00
liuhong 309ee56b03 * Fix bug #31537. 2023-01-06 06:36:13 +00:00
daitingting aa6206cdb3 * Finish task #82064. 2023-01-06 03:24:35 +00:00
hufangzhou df9a7a806a * Fix bug #31444. 2023-01-04 08:44:56 +00:00
daitingting 80cce4e580 * Finish task #82075. 2023-01-04 08:08:38 +00:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
田淑杰 b790198243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-30 08:46:01 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
孙广明 9b3d6387a5 * Finish task #81192. 2022-12-29 10:55:03 +08:00
xieqiyu bb0c7167c9 * Code for task#81187. 2022-12-28 14:20:57 +08:00
xieqiyu 260e043338 * Code for task#81187. 2022-12-28 13:40:27 +08:00
田淑杰 bf26d1f914 * Fix bug #29365. 2022-12-26 09:58:01 +08:00
lanzongjun 795dc6c13b * Finish Task #80491 2022-12-22 10:52:01 +08:00
wangyidong d24441491c * fix bug #30591. 2022-12-21 16:48:09 +08:00
wangyidong bc02660990 * code for task #80451. 2022-12-21 15:50:17 +08:00
caoyanyi 71bc8ac80a Merge branch 'master' into zenops_46 2022-12-21 13:56:27 +08:00
wangyidong 164cca5ffe * code task #80451. 2022-12-21 10:31:46 +08:00
lanzongjun 73b44f6bdd * Finish Task #80491 2022-12-20 18:03:52 +08:00
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
孙广明 aedf34e7dc Merge branch 'master_xieqiyu_30291' into 'master'
* Fix bug#30291.

See merge request easycorp/zentaopms!6585
2022-12-16 08:22:35 +00:00
孙广明 a5a440f62e Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug

See merge request easycorp/zentaopms!6584
2022-12-16 07:55:58 +00:00