Commit Graph
45184 Commits
Author SHA1 Message Date
xieqiyu 46bba7775e * Fix bug#27408. 2022-09-28 02:50:03 +00:00
王怡栋 7b25b702f7 Merge branch 'bug_28068' into 'master'
* Fix bug#28068

See merge request easycorp/zentaopms!5578
2022-09-28 02:09:49 +00:00
胡方舟 19175806f5 Merge branch 'sprint/wangzemei/241_fix' into 'master'
* fix bug #28047 # 28065

See merge request easycorp/zentaopms!5579
2022-09-28 00:55:03 +00:00
孙广明 dcdcaad2a0 Merge branch 'lyk_28056' into 'master'
* Fix bug #28056.

See merge request easycorp/zentaopms!5576
2022-09-28 00:53:58 +00:00
wangzemei 58969d7ade * fix bug #28047 # 28065 2022-09-28 08:52:48 +08:00
zenggang 4279033526 * Fix bug#28068 2022-09-27 08:41:55 +00:00
liuyongkai 7567b5b499 * Fix bug #28056. 2022-09-27 08:16:01 +00:00
胡方舟 6fd2b704dc Merge branch 'cyy_bug' into 'master'
* Fix bug #28030.

See merge request easycorp/zentaopms!5573
2022-09-27 08:05:30 +00:00
王怡栋 36641d7a97 Merge branch 'sprint/hufangzhou_bug_28003' into 'master'
* Fix bug #28003.

See merge request easycorp/zentaopms!5571
2022-09-27 07:35:26 +00:00
曹延义 c549090db1 * Fix bug #28030. 2022-09-27 15:28:12 +08:00
胡方舟 376197313f Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify navigation default font color.

See merge request easycorp/zentaopms!5570
2022-09-27 07:18:58 +00:00
hufangzhou 682425df5e * Fix bug #28003. 2022-09-27 15:17:41 +08:00
tianshujie 1513c4a303 * Modify navigation default font color. 2022-09-27 15:14:54 +08:00
胡方舟 a95042508e Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!5564
2022-09-27 05:51:26 +00:00
tianshujie 9a0642075a * Fix bug #27974,28001. 2022-09-27 13:42:30 +08:00
王怡栋 14012809bd Merge branch 'sprint/fixbug_liumengyi_26595' into 'master'
* Optimize code for bug #26595.

See merge request easycorp/zentaopms!5559
2022-09-27 05:36:13 +00:00
王怡栋 fba65fddac Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Add the fixed bugs to changelog.

See merge request easycorp/zentaopms!5563
2022-09-27 05:35:51 +00:00
王怡栋 bb0ba240a2 Merge branch 'sprint/fixbug_liumengyi_28010' into 'master'
* Fix bug #28010.

See merge request easycorp/zentaopms!5565
2022-09-27 05:35:41 +00:00
王怡栋 53f07a630a Merge branch 'sprint/xuan_fix_notification' into 'master'
* xuanxuan notification only support bug,task,story,mr

See merge request easycorp/zentaopms!5567
2022-09-27 05:34:30 +00:00
李玉春 cb1a4fad90 Merge branch 'cyy_bug' into 'master'
* Fix bug #28008.

See merge request easycorp/zentaopms!5560
2022-09-27 05:26:47 +00:00
chaideqing cb7aa61d79 * xuanxuan notification only support bug,task,story,mr 2022-09-27 13:26:32 +08:00
tianshujie f9d101fbcc * Fix bug #27965. 2022-09-27 13:26:09 +08:00
tianshujie 061d5050f7 * Adjust the record effort style. 2022-09-27 13:24:14 +08:00
tianshujie 0b280ca5c1 * Fix bug #28001. 2022-09-27 13:12:05 +08:00
tianshujie bc3a829601 * Fix bug #28004. 2022-09-27 11:40:19 +08:00
hufangzhou 7bf00beebb * Add the fixed bugs to changelog. 2022-09-27 11:15:38 +08:00
liumengyi cd63217eef * Fix bug #28010. 2022-09-27 11:12:29 +08:00
曹延义 b5ef45a53e * Fix bug #28008. 2022-09-27 10:49:24 +08:00
liumengyi 41dff1f5ff * Optimize code for bug #26595. 2022-09-27 10:27:21 +08:00
王怡栋 7b5a4bd46c Merge branch 'sprint/fixbug_liumengyi_26595' into 'master'
* Fix bug #26595.

See merge request easycorp/zentaopms!5557
2022-09-27 02:25:06 +00:00
王怡栋 272838612f Merge branch 'master_26245' into 'master'
*Fix bug #26245.

See merge request easycorp/zentaopms!5543
2022-09-27 02:24:11 +00:00
liuhong a7980a4852 *Update code logic. 2022-09-27 02:15:22 +00:00
tianshujie 09af08a56e * Fix bug #27965. 2022-09-27 10:00:14 +08:00
tianshujie 3243e1d1c2 * Fix bug #27971. 2022-09-27 09:49:13 +08:00
sunguangming 142f758c46 * Fix task view bug. 2022-09-27 09:30:33 +08:00
tianshujie 293f9a6a7c * Fix bug #27974. 2022-09-27 09:30:04 +08:00
liumengyi b19ca2dc9c * Fix bug #26595. 2022-09-27 09:28:16 +08:00
tianshujie a983257918 * Fix bug #27973. 2022-09-27 09:13:06 +08:00
tianshujie 074120b27c * Fix bug #27976. 2022-09-27 09:04:39 +08:00
liuhong 3501b84719 *Adjust code. 2022-09-27 00:59:14 +00:00
王怡栋 6c1872201a Merge branch 'fixbug' into 'master'
* Fix bug for bug export.

See merge request easycorp/zentaopms!5556
2022-09-27 00:51:11 +00:00
王怡栋 3e9725dd4d Merge branch 'sprint/hufangzhou_feedback_963' into 'master'
* Handle feedback #963.

See merge request easycorp/zentaopms!5538
2022-09-27 00:50:47 +00:00
hufangzhou 6c971a35c8 * Adjust the code. 2022-09-27 08:50:09 +08:00
tanghucheng 2ac544b181 * Fix bug for bug export. 2022-09-27 08:45:07 +08:00
王怡栋 718c35a9cd Merge branch 'case_patchedit' into 'master'
* Fix case batchedit.

See merge request easycorp/zentaopms!5522
2022-09-27 00:42:09 +00:00
李玉春 458c59dd42 Merge branch 'sprint/wangzemei/fix_27935' into 'master'
fix bug: 27935 & 27961 & 27955 &27932

See merge request easycorp/zentaopms!5555
2022-09-27 00:35:32 +00:00
tianshujie 36744c5175 * Adjust the record effort style. 2022-09-27 08:32:17 +08:00
wangzemei 3b79c8a74d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/fix_27935 2022-09-27 08:30:51 +08:00
wangzemei f10edf6adc * fix bug #27955 2022-09-27 08:30:38 +08:00
王怡栋 940fe22063 Merge branch 'master_freeback_5317' into 'master'
*Update verify duplicate department code before submit.

See merge request easycorp/zentaopms!5533
2022-09-27 00:27:02 +00:00