Commit Graph
515 Commits
Author SHA1 Message Date
李玉春 66ca553dad Merge branch 'sprint/master_zhouxudong_23111' into 'master'
Sprint/master zhouxudong 23111 19265

See merge request easycorp/zentaopms!3722
2022-06-02 06:32:26 +00:00
zhouxudong 3e4db334a5 * Fix bug #19265. 2022-06-02 06:24:53 +00:00
tianshujie d8f8e9cce0 * Modify variable name. 2022-06-02 13:26:10 +08:00
tianshujie c170d62313 * Resoled issue #656. 2022-06-02 13:16:37 +08:00
tianshujie aec74869fe * Finish task #55675. 2022-06-01 14:47:21 +08:00
tianshujie 3e10f3d0c9 * Finish task #55675. 2022-06-01 14:25:44 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie 5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
tianshujie b9a37d04a2 * Finish task #55675. 2022-06-01 11:08:51 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
liumengyi 52fc5e45ec * Fix bug #22665. 2022-05-25 13:40:38 +08:00
sunjun 2219a42fa2 fixbug_sunjun_194 2022-05-25 05:09:51 +00:00
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
#   module/kanban/config.php
2022-05-25 02:27:08 +00:00
liumengyi 743ea79536 * Fix bug #22665. 2022-05-25 10:04:18 +08:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
tianshujie 3b98d078af * Fix bug #22595. 2022-05-20 08:17:06 +08:00
xieqiyu 087b3ac65f * Code for task#54467. 2022-05-19 16:20:35 +08:00
liumengyi 1bc26d519a * Code format. 2022-05-18 16:03:25 +08:00
xieqiyu 5d73710741 * Finish task#54468. 2022-05-18 11:00:54 +08:00
王怡栋 ad6b686c0d Merge branch 'master_xieqiyu_54467' into 'master'
* Finish task#54467.

See merge request easycorp/zentaopms!3466
2022-05-18 01:52:49 +00:00
xieqiyu a68cf385bb * Finish task#54467. 2022-05-18 09:45:11 +08:00
liumengyi aa46dc6595 * Code format of bug #22582. 2022-05-18 09:13:05 +08:00
liumengyi 2b80e3d91f * Fix bug #22582. 2022-05-18 09:11:18 +08:00
李玉春 282f694f17 Merge branch 'sprint/191_tianshujie_54391' into 'master'
Sprint/191 tianshujie 54391

See merge request easycorp/zentaopms!3453
2022-05-18 00:53:44 +00:00
tianshujie 23111eff01 * Delete duplicate personnel. 2022-05-18 08:50:10 +08:00
liumengyi 7d2ab19bc4 * Code format for task #54349. 2022-05-17 17:16:53 +08:00
tianshujie c0d9625c1d * Add testcase of kanban module. 2022-05-17 17:07:36 +08:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
liumengyi b3fd6f4f53 * Add card desc of productplan card and build card. 2022-05-12 17:22:10 +08:00
liumengyi c5ee9d9873 * Finish task #53663. 2022-05-10 15:35:32 +08:00
Hao Sun 6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
王怡栋 6e608e2911 * adjust code for update kanban. 2022-03-31 10:43:09 +08:00
孙华伟 cbbc6be340 *Optimize the code. 2022-03-24 11:29:55 +08:00
tianshujie a4ac9d457a * Fix bug #21082. 2022-03-23 10:28:59 +08:00
tianshujie 56c777f843 * Fix bug #17668. 2022-03-22 14:10:13 +08:00
tianshujie 682eeae9e9 * Fix global add kanban error report. 2022-03-22 09:54:36 +08:00
tianshujie a8ec0be15c * Fix global add kanban error report. 2022-03-22 09:27:48 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tianshujie 6824ee4619 * Fix bug #20891. 2022-03-17 20:28:49 +08:00
孙广明 849646477a Merge branch 'pailei2_xieqiyu_20381' into 'pailei2'
* Fix bug#20381.

See merge request easycorp/zentaopms!2321
2022-03-17 05:49:46 +00:00
tianshujie cd98938d02 * Fix bug #18344. 2022-03-17 10:05:02 +08:00
xieqiyu be11d0b786 * Fix bug#20381. 2022-03-17 09:55:37 +08:00
tianshujie ccc2b37ee9 * Fix kanban column display problem. 2022-03-16 14:56:14 +08:00
tianshujie e2af5a521e * Fix bug #18760. 2022-03-16 14:08:44 +08:00
tianshujie a9df580dec * Fix bug #19243. 2022-03-15 16:22:25 +08:00
tianshujie 3b6637b9db * Fix bug #19243. 2022-03-15 16:18:46 +08:00