Commit Graph
45919 Commits
Author SHA1 Message Date
wangzemei cc3beb2e4c fix bug 28790 2022-10-21 11:30:29 +08:00
李玉春 d2c84e9026 Merge branch 'sprint/247_wzm_72350' into 'sprint/247'
* finish task 72350

See merge request easycorp/zentaopms!5845
2022-10-21 01:33:09 +00:00
wangzemei a9c02c65dd * adjust the format 2022-10-21 09:16:45 +08:00
tianshujie 8aa5a23c7f Merge branch 'sprint/247' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350 2022-10-21 08:37:44 +08:00
tianshujie 92c37d58a3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-21 08:25:20 +08:00
李玉春 f94b7a668b Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28764.

See merge request easycorp/zentaopms!5841
2022-10-20 23:57:56 +00:00
tianshujie c9331a121c * Fix bug #28764. 2022-10-20 17:22:36 +08:00
wangzemei a2fb82eff4 * modify radas radius 2022-10-20 16:45:27 +08:00
wangzemei e36bb94111 * fix max 2022-10-20 16:30:01 +08:00
李玉春 9d39fa89ad Merge branch 'sprint/247_tianshujie_style' into 'sprint/247'
Sprint/247 tianshujie style

See merge request easycorp/zentaopms!5838
2022-10-20 08:16:21 +00:00
tianshujie ae0c045c02 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 16:06:26 +08:00
wangzemei fc64618c6c * replace max 2022-10-20 15:55:46 +08:00
tianshujie faabb32285 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 15:53:21 +08:00
王怡栋 81706bf839 Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
* fix bug

See merge request easycorp/zentaopms!5836
2022-10-20 07:50:14 +00:00
lanzongjun 5583916635 * fix bug 2022-10-20 15:46:59 +08:00
王怡栋 f9b58e0701 Merge branch 'sprint/hufangzhou_sql' into 'master'
* Fix bug #28718.

See merge request easycorp/zentaopms!5830
2022-10-20 07:38:29 +00:00
王怡栋 647dd3107c Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
* fix bug

See merge request easycorp/zentaopms!5835
2022-10-20 07:35:52 +00:00
孙广明 5241c9ce44 Merge branch 'biz13_mayue_bug#28700' into 'master'
* Fix bug #28700.

See merge request easycorp/zentaopms!5834
2022-10-20 07:34:42 +00:00
mayue 5e7ab9df55 * Fix bug #28700. 2022-10-20 15:02:59 +08:00
wangzemei 8c0a0a8dbf * modify style 2022-10-20 14:57:53 +08:00
孙广明 239fbae00a Merge branch 'biz13_mayue_bug#28740' into 'master'
* Fix bug #28740.

See merge request easycorp/zentaopms!5833
2022-10-20 06:48:55 +00:00
lanzongjun e1330d9de1 * fix bug 2022-10-20 14:48:30 +08:00
mayue 670ffbe0ca * Fix bug #28740. 2022-10-20 14:36:47 +08:00
朱金勇 784ad83104 Merge branch 'sprint/remove-useless-load' into 'master'
- Remove useless loadModel search.

See merge request easycorp/zentaopms!5832
2022-10-20 06:27:14 +00:00
Lufei 4628dfe98a - Remove useless loadModel search. 2022-10-20 14:25:07 +08:00
tianshujie 4bce0e6e99 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 14:17:54 +08:00
李玉春 05e2c8242b Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5824
2022-10-20 06:15:37 +00:00
李玉春 23b1e0db4c Merge branch 'sprint/cyy_72375' into 'sprint/247'
* Modify multi task activate.

See merge request easycorp/zentaopms!5826
2022-10-20 06:04:53 +00:00
李玉春 3c6422bcf1 Merge branch 'sprint/247_tianshujie_css' into 'master'
* Adjust task list and create task page style.

See merge request easycorp/zentaopms!5829
2022-10-20 06:03:45 +00:00
王怡栋 628a15b24e Merge branch 'bug_28676' into 'master'
* Fix bug#28676

See merge request easycorp/zentaopms!5828
2022-10-20 05:59:56 +00:00
tianshujie 209d2b6d8d * Adjust task list and create task page style. 2022-10-20 13:56:53 +08:00
wangzemei 4924866a4e * replace echarts.timeline.js 2022-10-20 13:43:23 +08:00
hufangzhou e8879c8ad7 * Fix bug #28718. 2022-10-20 05:33:25 +00:00
zenggang 64e958b0f5 * Fix bug#28676 2022-10-20 05:27:28 +00:00
曹延义 03e4c78c5f * Modify multi task activate. 2022-10-20 11:25:42 +08:00
李玉春 651ce74b60 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Modify Kanban Settings page style issues.

See merge request easycorp/zentaopms!5823
2022-10-20 03:09:26 +00:00
tianshujie ca79d11271 * Finish task #72347. 2022-10-20 11:06:14 +08:00
tianshujie d55aedf3e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 11:04:27 +08:00
tianshujie 6ba9f6a195 * Fix bug #28706. 2022-10-20 11:02:11 +08:00
王怡栋 9ad259beb4 Merge branch 'master_28656' into 'master'
* Fix bug #28656.

See merge request easycorp/zentaopms!5822
2022-10-20 02:58:43 +00:00
王怡栋 50a3483775 Merge branch 'exportImg' into 'master'
* Remove \n for import bug.

See merge request easycorp/zentaopms!5821
2022-10-20 02:56:17 +00:00
tianshujie f107a95ba2 * Fix bug #28706. 2022-10-20 10:55:31 +08:00
tianshujie 17ef65813e * Modify Kanban Settings page style issues. 2022-10-20 10:37:07 +08:00
liuhong 20b111f0e2 * Fix bug #28656. 2022-10-20 02:14:10 +00:00
Yagami 8b41edadbf * Show create testreport btn in waterfall project. 2022-10-20 10:11:09 +08:00
李玉春 916defc350 Merge branch 'sprint/247_wangzemei_fixwidth' into 'master'
* Solved the problem of calculating the width of the table header

See merge request easycorp/zentaopms!5817
2022-10-20 01:57:24 +00:00
李玉春 c266ba1006 Merge branch 'sprint/cyy_72375' into 'sprint/247'
Sprint/cyy 72375

See merge request easycorp/zentaopms!5818
2022-10-20 01:57:11 +00:00
李玉春 6745ac5845 Merge branch 'sprint/247_tianshujie_css' into 'master'
* Fixed style issues with multi task.

See merge request easycorp/zentaopms!5820
2022-10-20 01:51:33 +00:00
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
wangzemei d6d3ecf886 * modify style 2022-10-20 09:22:53 +08:00