Commit Graph
32185 Commits
Author SHA1 Message Date
daitingting 90f6f0f63f * Build operate menu for story module. 2022-05-11 07:22:16 +00:00
liumengyi 8a4a6f8798 * Fix bug #22342. 2022-05-11 15:20:56 +08:00
孙广明 6c7ae2f82b Merge branch 'fixbug_sunjun_22310' into 'master'
Fixbug sunjun 22310

See merge request easycorp/zentaopms!3325
2022-05-11 07:13:27 +00:00
孙广明 d67f084989 Merge branch 'sprint/189_tianshujie_task53655' into 'master'
Sprint/189 tianshujie task53655

See merge request easycorp/zentaopms!3332
2022-05-11 07:11:59 +00:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
zhouxudong 02476229d9 * Fix bug #22337. 2022-05-11 06:59:17 +00:00
liyuchun 356aa74ca1 * Fix bug when create gitlab server. 2022-05-11 06:58:54 +00:00
zhouxudong f498199820 * Fix bug #22337. 2022-05-11 06:55:32 +00:00
zhouxudong 87b8baa7b3 * Fix bug #22337. 2022-05-11 06:46:39 +00:00
tianshujie 2bdfa7449d * Finish task #53831. 2022-05-11 14:44:16 +08:00
mayue 98dcd7517f * Optimize code. 2022-05-11 06:38:46 +00:00
hufangzhou 0657b7bb99 * Code for task #53673. 2022-05-11 14:34:15 +08:00
李玉春 dd61c615e4 Merge branch 'sprint/189_liumengyi_22311' into 'master'
* Mofidy date format.

See merge request easycorp/zentaopms!3327
2022-05-11 06:23:41 +00:00
liumengyi f6f44e76d9 * Mofidy date format. 2022-05-11 14:21:44 +08:00
sunjun eab7a12eff *Fixbug_sunjun_22310 2022-05-11 06:21:41 +00:00
tianshujie e316483175 * Finish task #53831. 2022-05-11 14:13:30 +08:00
李玉春 655981316d Merge branch 'sprint/189_liumengyi_22311' into 'master'
* Fix bug #22311, #22304,#22320,#22317.

See merge request easycorp/zentaopms!3326
2022-05-11 06:12:04 +00:00
zenggang ea968e917c * Adjust code 2022-05-11 06:11:55 +00:00
liumengyi 79f906415f * Code format for task #53647. 2022-05-11 14:07:14 +08:00
liumengyi 204e279687 * Fix bug #22311, #22304. 2022-05-11 13:52:33 +08:00
zenggang d0c81c2857 * Adjust code 2022-05-11 05:51:30 +00:00
孙广明 622185aa65 Merge branch 'sprint/189_zhouxudong_53651' into 'master'
Sprint/189 zhouxudong 53651

See merge request easycorp/zentaopms!3323
2022-05-11 05:51:12 +00:00
zhouxudong c0886b850d * Finish task #53651. 2022-05-11 05:49:21 +00:00
sunjun 60150b11ea *Fixbug_sunjun_22310 2022-05-11 05:46:03 +00:00
sunjun 93d72810eb *Fixbug_sunjun_22310 2022-05-11 05:44:14 +00:00
mayue ca2fc749cd * Optimize code. 2022-05-11 05:40:31 +00:00
mayue d560f6d2ab * Finish task #53652. 2022-05-11 05:38:29 +00:00
tianshujie 9c59fe5dd0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_tianshujie_task53655 2022-05-11 13:38:11 +08:00
liumengyi 3f0101ac01 * Fix bug #22320,#22317. 2022-05-11 13:37:49 +08:00
zhouxudong ca827e1d6c * Finish task #53651. 2022-05-11 05:32:48 +00:00
王怡栋 5cd347ce80 Merge branch 'sprint/daitingting_fix_story_assign' into 'master'
* Remove comment field of story.

See merge request easycorp/zentaopms!3324
2022-05-11 05:29:14 +00:00
daitingting 3315ef0f49 * Remove comment field of story. 2022-05-11 05:25:54 +00:00
王怡栋 82968630b0 Merge branch 'master_xieqiyu_53671' into 'master'
Master xieqiyu 53671

See merge request easycorp/zentaopms!3322
2022-05-11 05:17:05 +00:00
孙广明 da6ab52f7b Merge branch 'sprint/189_zhouxin_53658' into 'master'
Sprint/189 zhouxin 53658

See merge request easycorp/zentaopms!3321
2022-05-11 05:13:18 +00:00
zenggang a74c897ba3 * Adjust code 2022-05-11 05:11:52 +00:00
zhouxudong cec71ebfd8 * Finish task #53651. 2022-05-11 04:10:30 +00:00
xieqiyu 5c23f91a05 * Code for task#53671. 2022-05-11 11:29:03 +08:00
王怡栋 f98d33e010 Merge branch 'sprint/189_hufangzhou_53673' into 'master'
* Finish task #53673.

See merge request easycorp/zentaopms!3316
2022-05-11 03:27:53 +00:00
王怡栋 72584ceb38 Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-11 03:26:01 +00:00
zhouxin c78ab4be77 * Adjust code. 2022-05-11 03:24:49 +00:00
tanghucheng f3f0dd5647 * Code for task #53591. 2022-05-11 03:16:41 +00:00
tianshujie b715ecd177 * Finish task #53655. 2022-05-11 11:13:41 +08:00
zhouxin c6ac480351 * Fix bug. 2022-05-11 03:05:13 +00:00
zhouxudong da5cd2aa44 * Finish task #53651. 2022-05-11 03:02:28 +00:00
李玉春 2aeee3f5f4 Merge branch 'sprint/189_liumengyi_53647' into 'master'
* Fix bug for #task 53647.

See merge request easycorp/zentaopms!3319
2022-05-11 02:47:29 +00:00
liumengyi 460f597c60 * Fix bug for #task 53647. 2022-05-11 10:46:40 +08:00
xieqiyu f821b92e7f * Modify review code. 2022-05-11 10:44:00 +08:00
zhouxin fe6b01a440 * Adjust code. 2022-05-11 02:41:05 +00:00
李玉春 22cafe2e02 Merge branch 'sprint/189_liumengyi_53647' into 'master'
* Finish task #53647.

See merge request easycorp/zentaopms!3318
2022-05-11 02:40:46 +00:00
zhouxin 51ec6494a0 * Add comment. 2022-05-11 02:19:09 +00:00