Commit Graph
3016 Commits
Author SHA1 Message Date
tanghucheng 2eec12eeac * Format code for port. 2022-08-08 12:15:28 +08:00
tanghucheng d71cb4dd67 * Code for port. 2022-08-08 11:07:36 +08:00
tanghucheng 08b92c0ee8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-08 09:48:29 +08:00
liumengyi 911ba77fea * Fix bug #25992. 2022-08-05 16:16:05 +08:00
tanghucheng 3bfdc7d342 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 13:07:31 +08:00
zhouxin d4f4f06117 * Delete useless param. 2022-08-05 01:25:59 +00:00
zhouxin 6c1f9f0568 * Fix a bug. 2022-08-05 00:52:40 +00:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
daitingting a292bc7438 * Add createdBy,createdDate fields in build table. 2022-08-04 07:39:24 +00:00
tanghucheng 5f4699ceec Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-04 14:10:36 +08:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
tanghucheng a8fbdff6ba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-04 00:03:14 +08:00
zhouxin d55a19884c * Fix bug #25995. 2022-08-03 08:25:11 +00:00
liugang 1712298192 * Finish task #63383. 2022-08-03 14:37:01 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
tanghucheng 08073876bd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-02 17:50:50 +08:00
liumengyi a90490cc26 * Finish task #62939. 2022-08-02 09:05:55 +08:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
tanghucheng e642e85411 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-28 17:25:03 +08:00
王怡栋 cbd56f4fb7 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4706
2022-07-28 07:50:28 +00:00
zhouxudong 63bb63d9cf * Fix bug #25417. 2022-07-28 06:15:33 +00:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
tianshujie dbcb3c9f1b * Fix bug #25465. 2022-07-28 13:44:04 +08:00
liumengyi c9753f5490 * Fix bug #25814. 2022-07-28 13:22:32 +08:00
liumengyi 95c7c2ccfc * Fix bug #25814. 2022-07-28 13:01:06 +08:00
tanghucheng 81e9c63e5b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-28 11:05:51 +08:00
liumengyi 60b32e04da * Fix bug #25797. 2022-07-28 09:54:42 +08:00
tanghucheng cb6339024e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-27 17:17:39 +08:00
王怡栋 378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
tianshujie fd1868a287 * Fix bug #25465. 2022-07-27 16:22:07 +08:00
tanghucheng 46a8117b2d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-27 14:50:21 +08:00
王怡栋 8eb24df570 Merge branch 'sprint220_zg_61964' into 'master'
Sprint220 zg 61964

See merge request easycorp/zentaopms!4663
2022-07-27 02:05:06 +00:00
xieqiyu 94c72b04e1 * Fix bug#25708. 2022-07-27 08:29:42 +08:00
tanghucheng 08bb4143fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-26 17:24:48 +08:00
chaideqing 9fc68cfe73 * bug view remove toTask in xuanxuan 2022-07-26 16:39:39 +08:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
孙广明 867f5467d9 * Fix bug #25678. 2022-07-26 13:20:41 +08:00
zhouxudong cf6845878f * Fix bug. 2022-07-26 02:21:28 +00:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
tanghucheng be483be25b * Code for bug showimport. 2022-07-25 11:24:37 +08:00
tanghucheng 96cef1ccfc * Code for bug export. 2022-07-25 09:23:26 +08:00
tanghucheng a12e616202 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 14:18:04 +08:00
liumengyi ba22c27e28 * Fix bug #24181. 2022-07-22 10:35:37 +08:00
tanghucheng 004561024f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-21 17:37:48 +08:00
tianshujie 03f9bca910 * Fix bug #25465. 2022-07-21 08:46:07 +08:00
tanghucheng d0694aae7e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-20 16:02:00 +08:00
liumengyi 9ed05fad25 * Optimize code for task #61173. 2022-07-20 15:59:50 +08:00
liumengyi d161817441 * Optimize code for task #61173. 2022-07-20 15:56:59 +08:00
liumengyi 13eda1d631 * Finish task #61173. 2022-07-20 10:28:01 +08:00