Commit Graph
39412 Commits
Author SHA1 Message Date
王怡栋 bc882d23bc Merge branch 'master_xieqiyu_54989' into 'master'
* Finish task#54989.

See merge request easycorp/zentaopms!3569
2022-05-24 09:18:19 +00:00
孙广明 9b85ffb113 Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22715, #22759.

See merge request easycorp/zentaopms!3571
2022-05-24 09:14:43 +00:00
liumengyi 0a559f1e8d * Fix bug #22715. 2022-05-24 17:12:13 +08:00
xieqiyu 23e2c29c1a * Finish task#54989. 2022-05-24 17:04:09 +08:00
wangyidong 2bbae04ded * adjust for tid. 2022-05-24 16:57:56 +08:00
孙广明 1926f2ee8d Merge branch 'sprint/195_mayue_task#55175' into 'master'
* Finish task #55175.

See merge request easycorp/zentaopms!3563
2022-05-24 08:52:12 +00:00
mayue 815eb40a20 * Optimize code. 2022-05-24 08:39:55 +00:00
mayue db30dd1cad * Optimize code. 2022-05-24 08:37:10 +00:00
liumengyi 5a23ce2d5c * Fix bug #22759. 2022-05-24 16:34:16 +08:00
孙广明 cc2d2abef4 Merge branch 'sprint/194_liumengyi_55254' into 'master'
* Finish task #55254 and fix bug.

See merge request easycorp/zentaopms!3568
2022-05-24 08:24:53 +00:00
xieqiyu d9bbc81938 * Finish task#54989. 2022-05-24 16:23:54 +08:00
孙广明 c9ed9ca81f Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22800.

See merge request easycorp/zentaopms!3567
2022-05-24 08:23:23 +00:00
孙广明 ee54702941 Merge branch 'sprint/195_mayue_task#55171' into 'master'
* Finish task #55171.

See merge request easycorp/zentaopms!3566
2022-05-24 08:19:05 +00:00
liumengyi 2561c857b7 * Fix bug #22800. 2022-05-24 16:14:00 +08:00
tianshujie 7d4781fdd2 * Fixed edit Execution Kanban save error. 2022-05-24 16:13:37 +08:00
mayue 21402a6f66 * Finish task #55171. 2022-05-24 08:12:28 +00:00
liumengyi 39a163e0a8 * Fix bug for task #55254. 2022-05-24 16:04:10 +08:00
wangyidong b072234b4d * adjust for tid. 2022-05-24 15:53:57 +08:00
mayue 07906fb1f8 * Add code comments. 2022-05-24 07:38:39 +00:00
mayue 37125b72bc * Finish task #55175. 2022-05-24 07:34:38 +00:00
liyuchun e56bd44299 Merge branch 'sgm_sprint195' 2022-05-24 06:58:35 +00:00
李玉春 b5ad70bcb7 Merge branch 'master' into 'sgm_sprint195'
# Conflicts:
#   db/update17.0.beta1.sql
2022-05-24 06:58:00 +00:00
孙广明 fb61022d2c * Add sql for issue. 2022-05-24 14:56:53 +08:00
李玉春 23dc6ddccd Merge branch 'sgm_unittest' into 'master'
Sgm unittest

See merge request easycorp/zentaopms!3554
2022-05-24 06:47:28 +00:00
liumengyi 816999dbeb * Finish task #55254. 2022-05-24 14:41:42 +08:00
孙广明 77dd8b3b64 Merge branch 'sprint/matser_zhouxudong_22722' into 'master'
Sprint/matser zhouxudong 22722

See merge request easycorp/zentaopms!3560
2022-05-24 06:34:08 +00:00
zhouxudong 189ea8b1a7 * Fix bug #22722. 2022-05-24 06:33:04 +00:00
孙广明 495a034784 * Finish task #55178. 2022-05-24 14:15:34 +08:00
李玉春 856611ca70 Merge branch 'sprint/194_liumengyi_activeKanban' into 'master'
* Fnish task #55255.

See merge request easycorp/zentaopms!3558
2022-05-24 05:40:21 +00:00
liumengyi 94078cdc6c * Fix bug for task #55255. 2022-05-24 13:39:27 +08:00
李玉春 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
zhouxudong 3012bbd26c * Fix bug #22722. 2022-05-24 03:02:05 +00:00
zhouxudong b57ec6aef4 * Fix bug #22722. 2022-05-24 02:59:16 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
zhouxudong d41ea8cfc2 * Finish bug #22722. 2022-05-24 02:42:29 +00:00
孙广明 62cff2234d * Remove unused code. 2022-05-24 10:36:50 +08:00
孙广明 1616e01773 * Add group-updateview test. 2022-05-24 10:34:52 +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