Commit Graph
45895 Commits
Author SHA1 Message Date
王怡栋 de5212fd90 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#28145.

See merge request easycorp/zentaopms!5855
2022-10-21 07:58:16 +00:00
xieqiyu 6731c7d6cb * Fix bug#26119. 2022-10-21 15:40:36 +00:00
xieqiyu 1a4bfe923e * Fix bug#26953. 2022-10-21 14:58:17 +00:00
xieqiyu 530f513af0 * Fix bug#26957. 2022-10-21 14:55:46 +00:00
xieqiyu cdb45a8925 * Fix bug#28145. 2022-10-21 13:16:52 +00:00
王怡栋 d84799d514 Merge branch 'master_bug_28775' into 'master'
* Fix bug #28775.

See merge request easycorp/zentaopms!5854
2022-10-21 07:57:39 +00:00
王怡栋 d1960a0f55 Merge branch 'master_bug_24436' into 'master'
* Fix bug #24436.

See merge request easycorp/zentaopms!5853
2022-10-21 07:57:15 +00:00
李玉春 ea7ed2c31b Merge branch 'sprint/247_wzm_blue' into 'master'
* fix table line aboout blue

See merge request easycorp/zentaopms!5857
2022-10-21 06:04:17 +00:00
wangzemei 04755d5920 * fix table line aboout blue 2022-10-21 14:01:30 +08:00
liuhong bb47c6e1da * Fix bug #28775. 2022-10-21 05:22:05 +00:00
liuhong 482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +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
孙广明 179e7f7ee2 Merge branch 'sprint/ZUI_guofeilong_add_icon_ticket' into 'master'
* add Icon ticket

See merge request easycorp/zentaopms!5847
2022-10-21 02:41:43 +00:00
guofeilong 1acc727f00 * add Icon ticket 2022-10-21 02:26:53 +00: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
tanghucheng 4bb1f27573 * Fix bug #28711. 2022-10-20 17:06:00 +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
孙广明 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
李玉春 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
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
李玉春 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
李玉春 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