Commit Graph
3297 Commits
Author SHA1 Message Date
xieqiyu 63149fd719 * Finish task#81540. 2022-12-29 15:53:34 +08:00
liuhong 8c1b9bf90d * Fix bug #30940. 2022-12-26 04:15:11 +00:00
孙广明 47817d9153 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30879

See merge request easycorp/zentaopms!6565
2022-12-15 08:10:30 +00:00
lanzongjun 9d0a087132 * Fix Bug #30879 2022-12-15 16:09:01 +08:00
孙广明 b827ae2002 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909

See merge request easycorp/zentaopms!6549
2022-12-15 07:58:29 +00:00
lanzongjun 72f9a71865 * Fix Bug #30886 2022-12-15 14:51:51 +08:00
孙广明 52ba26c18c * Fix bug #30885. 2022-12-15 14:13:32 +08:00
孙广明 ca6987d98a Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #30800.

See merge request easycorp/zentaopms!6557
2022-12-15 06:04:21 +00:00
田淑杰 6699ab0a60 * Fix bug #30800. 2022-12-15 14:02:23 +08:00
孙广明 a72aba558a * Fix bug #30875. 2022-12-15 14:00:32 +08:00
孙广明 151a08af27 * Fix bug #30795. 2022-12-15 13:38:39 +08:00
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
孙广明 b654a1f43d Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #79665#79466

See merge request easycorp/zentaopms!6542
2022-12-14 06:15:04 +00:00
hufangzhou 6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
lanzongjun afd4d269a2 * Finish Task #79665 2022-12-14 09:33:20 +08:00
孙广明 0beb81ebd7 * Fix multi task bug. 2022-12-13 16:15:28 +08:00
孙广明 55c79e0399 * Code for task #79664. 2022-12-13 15:20:09 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
lanzongjun c3d53daa5a * Finish Task #79665 2022-12-12 16:36:32 +08:00
文睿 李 cb729e1864 * resolve conflict of task model, add method for task searching. 2022-12-08 03:44:50 +00:00
Wenrui LI 6491d70c06 * move task get list by search into task model, and add to api. 2022-12-07 09:43:50 +08:00
Wenrui LI 71f0eaad7f * move getListByConds of xuanbot to extension. 2022-12-02 10:36:28 +08:00
Wenrui LI 0d15699df3 * fix zentao bot. 2022-12-02 09:22:04 +08:00
Chenjianyu 364eb8da6e * add a task query method for zentao bot. 2022-12-02 08:14:40 +08:00
王怡栋 00312f6d4f Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358

See merge request easycorp/zentaopms!6431
2022-12-01 07:56:07 +00:00
王怡栋 7013e19604 Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
2022-12-01 07:54:50 +00:00
chaideqing 3c3ce67354 * Refactor code. 2022-12-01 13:35:05 +08:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
chaideqing 9fcb9099a7 * Fix feedback #1358. 2022-11-30 11:13:12 +08:00
lanzongjun edbf6b4307 * Fix Bug #30245 2022-11-25 10:37:19 +08:00
zenggang 748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
Yagami 9e0c890def * Fix task list bug. 2022-11-22 15:05:04 +08:00
Yagami cac547b21a * Finish task #76948. 2022-11-21 15:11:44 +08: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
wangyuting 6a204a32c0 * Fix bug #29720. 2022-11-15 09:35:10 +00:00
xieqiyu 864ed7a391 * Fix bug#29445. 2022-11-15 09:04:14 +08:00
mayue e45a22f25d * Fix bug #29410. 2022-11-14 14:47:50 +08:00
mayue 03ff3c3b36 * Optimize page style. 2022-11-14 10:55:28 +08:00
mayue c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
wangyuting 152364d338 * Finish task #29562. 2022-11-11 02:12:03 +00:00
王怡栋 3beb994fe8 Merge branch 'master_bug_29451' into 'master'
* Fix bug #29451

See merge request easycorp/zentaopms!6095
2022-11-10 06:24:33 +00:00
zenggang fd5682fbdc * Fix bug #29460 2022-11-09 07:48:08 +00:00
liuhong f12632a8fb * Fix bug #29451 2022-11-09 02:15:23 +00:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie 32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
tianshujie 8e67ec5de9 * Optimize the form for recording work hours for multi-person tasks. 2022-11-07 11:04:45 +08:00
tianshujie 280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00