Commit Graph
37756 Commits
Author SHA1 Message Date
xieqiyu cdb45a8925 * Fix bug#28145. 2022-10-21 13:16:52 +00:00
孙广明 768aa9ba1b Merge branch 'biz13_mayue_bug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!5849
2022-10-21 03:44:34 +00:00
mayue bd13e39ade * Add product column. 2022-10-21 11:42:43 +08:00
王怡栋 30297395a9 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!5850
2022-10-21 03:23:28 +00:00
tanghucheng 9f93959a3f * Fix bug . 2022-10-21 11:12:55 +08:00
王怡栋 104d16426e Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28711.

See merge request easycorp/zentaopms!5842
2022-10-21 03:09:26 +00:00
mayue 9c958e3b9a * Optimize code. 2022-10-21 11:06:52 +08:00
孙广明 bc6716dcdb Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
fix icon-ticket

See merge request easycorp/zentaopms!5848
2022-10-21 02:58:53 +00:00
lanzongjun 6d540cc1cb fix icon-ticket 2022-10-21 10:45:52 +08:00
tianshujie c9331a121c * Fix bug #28764. 2022-10-20 17:22:36 +08:00
tanghucheng 4bb1f27573 * Fix bug #28711. 2022-10-20 17:06:00 +08: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
mayue 5e7ab9df55 * Fix bug #28700. 2022-10-20 15:02:59 +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
Lufei 4628dfe98a - Remove useless loadModel search. 2022-10-20 14:25:07 +08: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
tianshujie 209d2b6d8d * Adjust task list and create task page style. 2022-10-20 13:56:53 +08:00
zenggang 64e958b0f5 * Fix bug#28676 2022-10-20 05:27:28 +00: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 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
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
wangzemei 5233ec969c * Solved the problem of calculating the width of the table header 2022-10-20 08:58:49 +08:00
王怡栋 5bed328848 Merge branch 'master_feedback_1133' into 'master'
* Adjust code format.

See merge request easycorp/zentaopms!5815
2022-10-20 00:30:53 +00:00
tanghucheng 21a17f9e0e * Remove \n for import bug. 2022-10-20 07:54:53 +08:00
liuhong f756b892d6 * Adjust code format. 2022-10-19 12:53:54 +00:00
孙广明 563f523f9c Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28499.

See merge request easycorp/zentaopms!5810
2022-10-19 09:04:51 +00:00
李玉春 45db98047c Merge branch 'cyy_bug' into 'master'
* Fix bug #28128.

See merge request easycorp/zentaopms!5814
2022-10-19 09:03:36 +00:00
李玉春 4aeb260282 Merge branch 'sprint/247_wangzemei_28395' into 'master'
* Solve width calculation problems

See merge request easycorp/zentaopms!5807
2022-10-19 09:02:52 +00:00
曹延义 e16a4eb765 * Fix bug #28128. 2022-10-19 17:01:56 +08:00
孙广明 ec22de682f Merge branch 'biz13_mayue_bug#28337' into 'master'
* Add the status column of Kanban import ticket.

See merge request easycorp/zentaopms!5812
2022-10-19 08:59:05 +00:00
王怡栋 7ed78a0b05 Merge branch 'master_feedback_420' into 'master'
* Adjust the code format.

See merge request easycorp/zentaopms!5806
2022-10-19 08:57:34 +00:00
王怡栋 e3f2bce7ca Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28684.

See merge request easycorp/zentaopms!5811
2022-10-19 08:55:39 +00:00
mayue 06e4a05403 * Add the status column of Kanban import ticket. 2022-10-19 16:36:01 +08:00
tanghucheng c0a9e98cd1 * Fix bug #28684,28680. 2022-10-19 15:42:46 +08:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
孙广明 af6634eaad Merge branch 'biz13_mayue_bug#28666' into 'master'
* Fix bug #28666.

See merge request easycorp/zentaopms!5809
2022-10-19 07:17:43 +00:00
mayue 1221260f0b * Fix bug #28666. 2022-10-19 15:13:16 +08:00
wangzemei 84f1b64aae * remove useless class 2022-10-19 14:35:12 +08:00
wangzemei 25f8023fef * Solve width calculation problems 2022-10-19 14:31:55 +08:00
liuhong 6133c2ca58 * Adjust the code format. 2022-10-19 06:25:39 +00:00
王怡栋 171ad26855 Merge branch 'master_feedback_1133' into 'master'
* Adjust the code format.

See merge request easycorp/zentaopms!5805
2022-10-19 06:21:49 +00:00