Commit Graph
2831 Commits
Author SHA1 Message Date
tanghucheng a8fbdff6ba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-04 00:03:14 +08:00
liumengyi 1fe596b022 * Fix bug #25994. 2022-08-03 17:17:16 +08:00
liumengyi 5acd4b9127 * Fix bug #25994. 2022-08-03 17:12:07 +08:00
zenggang 3a9f4d8ada * Fix bug#25897,22882 2022-08-03 07:16:28 +00:00
tanghucheng 1c730049d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-03 14:11:48 +08:00
liumengyi 1247155cc1 * Fix bug #25978. 2022-08-03 13:27:05 +08:00
王怡栋 1d59e34b07 Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg

See merge request easycorp/zentaopms!4751
2022-08-03 02:12:38 +00:00
tanghucheng 08073876bd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-02 17:50:50 +08:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
tanghucheng 4da40b6021 * Code for task config. 2022-08-02 08:52:47 +08:00
liumengyi de29183b2c * Finish task #62944. 2022-08-01 16:16:25 +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
王怡栋 0fb7686978 Merge branch 'sprint220_zg_61964' into 'master'
* Code for task#61964

See merge request easycorp/zentaopms!4680
2022-07-27 07:10:24 +00:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
tanghucheng 46a8117b2d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-27 14:50:21 +08:00
zenggang 56b4e30328 * Code for task#61964 2022-07-27 06:45:26 +00: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
zenggang 4bd33b9cba * Adjust code 2022-07-27 01:53:26 +00:00
tanghucheng 08bb4143fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-26 17:24:48 +08:00
王怡栋 8456a1da21 Merge branch 'sprint/220_liumengyi_62026' into 'master'
* Fix bug #23200.

See merge request easycorp/zentaopms!4659
2022-07-26 08:13:44 +00:00
王怡栋 649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
liumengyi 174d226f86 * Fix bug #62026. 2022-07-26 14:53:15 +08:00
zhouxudong b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
tianshujie 52dccd78bc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/220_tianshujie_61965 2022-07-26 10:49:03 +08:00
zhouxudong d0aabb1d4d * Finish task #61908. 2022-07-26 01:36:22 +00:00
tianshujie e73517cfc0 * Modify the style of the task view page return button. 2022-07-26 09:16:28 +08:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
zhouxudong bc7382a1fb * Finish task #61908. 2022-07-25 06:31:22 +00:00
tanghucheng 2eacd5271e * Code for port. 2022-07-25 08:10:22 +08:00
tanghucheng a12e616202 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 14:18:04 +08:00
孙广明 f95c3ee86f Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4638
2022-07-22 05:42:16 +00:00
tanghucheng 40fdd61654 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 10:53:27 +08:00
tianshujie 5818db887f * Fix bug #25122. 2022-07-22 10:28:42 +08:00
王怡栋 71dd54df7a Merge branch 'master_liuhong_24666' into 'master'
Master liuhong 24666

See merge request easycorp/zentaopms!4624
2022-07-22 01:01:47 +00:00
孙广明 59a81e4466 Merge branch 'sprint/217_liumengyi_24337' into 'master'
* Fix bug #24337.

See merge request easycorp/zentaopms!4622
2022-07-21 09:39:30 +00:00
tanghucheng 004561024f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-21 17:37:48 +08:00
王怡栋 dcd013186a Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4620
2022-07-21 05:08:47 +00:00
liuhong e858799e11 *Fix bug #24666 2022-07-21 04:23:38 +00:00
liuhong 25a0350108 * Fix bug#24666. 2022-07-21 04:20:57 +00:00
liumengyi 96c59fdf52 * Fix bug #24337. 2022-07-21 10:22:00 +08:00
王怡栋 660f0d0d85 Merge branch 'sprint/master_zhouxudong_61441' into 'master'
Sprint/master zhouxudong 61441

See merge request easycorp/zentaopms!4606
2022-07-21 02:03:20 +00:00
tianshujie f32443218c * Fix bug #25461. 2022-07-21 09:56:25 +08:00
zhouxudong 9d5f891419 * Finish task #61441. 2022-07-21 01:40:43 +00:00
zhouxudong 1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
liumengyi 72ed2599d1 * Fix bug #25230. 2022-07-21 09:22:20 +08:00
zhouxudong c637a40725 * Finish task #61441. 2022-07-20 06:56:14 +00:00
zhouxudong 8e46671c20 * Finish task #61441. 2022-07-20 03:07:38 +00:00
zhouxudong 178ea59c4e * Finish task #61441. 2022-07-20 02:30:19 +00:00
tanghucheng f714bae75f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-18 14:44:48 +08:00