Commit Graph
1875 Commits
Author SHA1 Message Date
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
孙广明 c671cc3186 Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674

See merge request easycorp/zentaopms!3691
2022-06-01 08:57:31 +00:00
zhouxin cda4d7e809 * Adjust code. 2022-06-01 08:56:49 +00:00
liumengyi 06a0bb6f03 * Fix bug #23110, #23109. 2022-06-01 16:27:03 +08:00
zhouxin 2fcd623c62 * Adjust code. 2022-06-01 07:48:32 +00:00
zhouxin bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
tianshujie 095c9b5501 * Finish task #55681. 2022-06-01 15:07:35 +08:00
孙广明 a8e0efeaf2 Merge branch 'sprint/197_tianshujie_55675' into 'sprint/197'
Sprint/197 tianshujie 55675

See merge request easycorp/zentaopms!3680
2022-06-01 06:50:23 +00:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
tianshujie 78d38d7723 Merge branch 'sprint/197_tianshujie_55675' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/197_tianshujie_55675 2022-06-01 13:51:08 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie b076635c79 * Finish task #55675. 2022-06-01 13:32:34 +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
王怡栋 f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
王怡栋 817dffafc8 Merge branch 'sprint/196_zhouxudong_55623' into 'sprint/196'
Sprint/196 zhouxudong 55623

See merge request easycorp/zentaopms!3676
2022-06-01 02:20:14 +00:00
tanghucheng c9daed297e * Fix bug #23105. 2022-06-01 08:41:04 +08:00
xieqiyu b041e5c885 * After creating a bug in the execution bug list, you jump to the execution testcase list. 2022-05-31 20:28:13 +08:00
tanghucheng 648362bfdb * Fix bug #23095. 2022-05-31 17:22:15 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
王怡栋 e0adec2091 Merge branch 'master_xieqiyu_55620' into 'sprint/196'
* Finish task#55620,#55627.

See merge request easycorp/zentaopms!3666
2022-05-31 08:15:51 +00:00
孙广明 4e913acb10 Merge branch 'sprint/master_zhiuxudong_55626' into 'sprint/196'
Sprint/master zhiuxudong 55626

See merge request easycorp/zentaopms!3664
2022-05-31 07:01:18 +00:00
王怡栋 375444f16e Merge branch 'sprint/master_zhouxudong_22936' into 'master'
* Fix bug #29936.

See merge request easycorp/zentaopms!3658
2022-05-31 06:18:51 +00:00
zhouxudong 93e753b39e * Finish task #55619 #55626. 2022-05-31 06:03:37 +00:00
liumengyi e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00
zhouxudong d67617d5ce * Fix bug #29936. 2022-05-31 00:17:10 +00:00
xieqiyu 037a010a6f * Code for task#55626. 2022-05-31 00:11:29 +08:00
zhouxudong afa9003035 * Finisha task #55626 #55619. 2022-05-31 05:09:49 +00:00
xieqiyu 4d043935be * Finish task#55620,#55627. 2022-05-30 23:29:15 +08:00
tianshujie 240cefb5df * Fixed kanban card style issues. 2022-05-30 09:21:39 +08:00
tianshujie e037b9c102 * Fixed kanban card avatar style. 2022-05-30 09:14:58 +08:00
tianshujie 5fe9641ce9 * Fix the display style of the task card. 2022-05-30 09:04:53 +08:00
孙广明 747e83db18 Merge branch 'sprint/192_leiyong_bug_22948' into 'master'
* Fix bug#22948.

See merge request easycorp/zentaopms!3638
2022-05-29 06:01:24 +00:00
李玉春 84fe5b847e Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23012.

See merge request easycorp/zentaopms!3641
2022-05-27 03:02:02 +00:00
liumengyi 62445ea7b0 * Code format. 2022-05-27 10:59:23 +08:00
liumengyi f889692b40 * Remove empty line. 2022-05-27 10:47:19 +08:00
liumengyi 87ef728908 * Fix bug #23012. 2022-05-27 10:46:02 +08:00
李玉春 c96ae16062 Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23022.

See merge request easycorp/zentaopms!3637
2022-05-27 01:54:16 +00:00
liumengyi ecdbeb4e0a * Fix bug #23022. 2022-05-27 09:51:32 +08:00
leiyong 2370066590 * Fix bug#22948. 2022-05-27 01:51:14 +00:00
王怡栋 a0af734e79 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
Sprint/master zhouxudong 54991

See merge request easycorp/zentaopms!3626
2022-05-26 09:28:41 +00:00
zhouxudong 715527fd59 * Finish task #54991. 2022-05-26 09:19:50 +00:00
zhouxudong e70628fef0 * Finish task #54991. 2022-05-26 07:40:28 +00:00
zhouxudong 4b956437fd * Finisha task #54991. 2022-05-26 06:30:06 +00:00
孙广明 04eef93c0f Merge branch 'springt/195_zg_22897' into 'master'
* Fix bug#22897

See merge request easycorp/zentaopms!3597
2022-05-26 01:35:09 +00:00
wangyidong 22ee2ff226 * adjust for flow lang. 2022-05-26 09:28:14 +08:00
zhouxudong 93c4c7bc5e * Fix bug #22936. 2022-05-25 08:52:09 +00:00
zenggang 764c2bec29 * Fix bug#22897 2022-05-25 08:27:25 +00:00