Commit Graph
39377 Commits
Author SHA1 Message Date
李玉春 03469dbd1e Merge branch 'sprint/194_tianshujie_14741' into 'master'
Sprint/194 tianshujie 14741

See merge request easycorp/zentaopms!3557
2022-05-24 05:39:25 +00:00
tianshujie 63b5d64dc8 * Finish task #14741. 2022-05-24 13:38:11 +08:00
李玉春 ffb7904cee Merge branch 'sprint/194_liumengyi_activeKanban' into 'master'
* Finish task #55255.

See merge request easycorp/zentaopms!3556
2022-05-24 05:38:09 +00:00
liumengyi 94e8879729 * Modify format fot ask #55255. 2022-05-24 13:34:29 +08:00
tianshujie e9bf958a3c * Finish task #55253. 2022-05-24 13:28:16 +08:00
liumengyi 5071122e0b * Modify date. 2022-05-24 13:18:29 +08:00
liumengyi 8ff63b2215 * Fix bug for task #55255. 2022-05-24 13:15:07 +08:00
孙广明 1b506899e2 Merge branch 'mayue_add_group_auto_test' into 'master'
* Add group unit test.

See merge request easycorp/zentaopms!3555
2022-05-24 03:19:21 +00:00
mayue 7bd72b3a22 * Add group unit test. 2022-05-24 03:16:47 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
tianshujie 02bee27596 * Finish story #14741. 2022-05-24 10:11:08 +08:00
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
王怡栋 f89d4cda47 Merge branch 'spring/189_hufangzhou_split' into 'sprint/189_package'
* Adjust the code.

See merge request easycorp/zentaopms!3552
zentaopms_17.0.beta1
2022-05-20 10:57:03 +00:00
hufangzhou 9f1ac822bf * Adjust the code. 2022-05-20 18:55:46 +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
wangyidong 3b7aa9ed80 * fix bug. 2022-05-20 17:07:55 +08:00
王怡栋 0954ed5a20 Merge branch 'sprint/189_wangyuting_fixbug' into 'sprint/189_package'
* Optimized code.

See merge request easycorp/zentaopms!3549
2022-05-20 08:32:50 +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
wangyuting2 b5337689e2 * Optimized code. 2022-05-20 16:09:50 +08:00
sunjun adf3ad1e97 sprint_sunjun_test 2022-05-20 08:06:30 +00:00
wangyidong 17d1e3301b * code for #54801. 2022-05-20 15:54:35 +08:00
王怡栋 6329c5c4d8 Merge branch 'sprint/daitingting_189_package_54801' into 'sprint/189_package'
* Finish task #54801.

See merge request easycorp/zentaopms!3515
2022-05-20 07:48:02 +00:00
daitingting 00ebebb6ed * Check privilege by buildMenu. 2022-05-20 07:38:22 +00:00
wangyidong 55b68c8a57 * adjust for round error. 2022-05-20 15:23:02 +08: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
王怡栋 342dcd2da1 Merge branch 'tanghucheng_fixbug' into 'sprint/189_package'
* Fix bug.

See merge request easycorp/zentaopms!3543
2022-05-20 05:06:42 +00:00
唐胡成 834ffeeb1c Update lite.php 2022-05-20 05:06:24 +00:00
xieqiyu c07f0dbdab * Finish task#54463. 2022-05-20 12:37:26 +08:00
wangyidong 8d808c560f * fix bug. 2022-05-20 12:00:52 +08:00
tanghucheng 52e57b3f16 * Fix bug. 2022-05-20 03:54:36 +00:00
leiyong df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
wangyidong 99f1170ca7 * cahnge can search for workflow. 2022-05-20 11:38:23 +08: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
wangyidong 2051f9a371 * code for bug #22577. 2022-05-20 10:56:23 +08:00