Commit Graph
823 Commits
Author SHA1 Message Date
王怡栋 048cc1fa75 Merge branch 'importExport' into 'master'
Merge branch importExport into 'master'

See merge request easycorp/zentaopms!4830
2022-08-08 08:27:59 +00:00
wangyidong 9136083b10 * fix bug. 2022-08-08 16:09:32 +08:00
wangyidong 660c82b46e * adjust for change table engine in upgrade. 2022-08-08 14:05:50 +08:00
tanghucheng 3bfdc7d342 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 13:07:31 +08: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
daitingting 8871dc9f69 * Update approval at last. 2022-08-04 06:03:39 +00:00
wangyidong 0ce2b35004 * fix for change table engine for upgrade. 2022-08-04 11:51:03 +08:00
wangyidong d06f01a509 * fix bug for upgrade. 2022-08-04 11:11:28 +08:00
wangyidong a194dd86ca Merge branch 'sprint/devplat_30' 2022-08-04 09:59:15 +08:00
daitingting c95a839fcb * Process createdBy if the field is not createdBy. 2022-08-04 01:39:12 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
liuruogu 19f44337d3 * Finish task #62927, #62926, #62925. 2022-08-03 02:12:29 +00:00
tanghucheng 08073876bd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-02 17:50:50 +08:00
liuruogu cfdb0f849a * Finish task #62920. 2022-08-02 09:21:49 +00:00
wangyidong 99c5aab19a * code for task #62739. 2022-08-02 16:18:38 +08:00
daitingting b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00:00
tanghucheng 1d3f71d270 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-01 16:04:14 +08:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
hufangzhou af13d9bdb4 * Adjust the code. 2022-08-01 15:03:52 +08:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
tianshujie 6904928898 * Fix bug #25389. 2022-07-22 13:25:09 +08:00
王怡栋 f4fb9ca204 Merge branch 'sprint/217_liumengyi_61173' into 'master'
* Finish task #61173.

See merge request easycorp/zentaopms!4609
2022-07-20 08:01:12 +00:00
liumengyi 13eda1d631 * Finish task #61173. 2022-07-20 10:28:01 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
tianshujie 5e464f8b85 * Fix bug #25375. 2022-07-15 13:09:24 +08:00
wangyidong 2bc0a7f4c1 * fix for upgrade. 2022-07-13 14:21:13 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
lanzongjun 818bd7085c * fix task #60360 2022-07-13 11:11:57 +08:00
lanzongjun 175b5c0669 * fix task #60360 2022-07-13 11:09:24 +08:00
lanzongjun 7637e225d4 * fix task #60360 2022-07-13 11:08:30 +08:00
hufangzhou f5eb826556 * Change the ci release path and Modify the xuanxuan upgrade program. 2022-07-06 14:02:59 +08:00
hufangzhou ca595e9c86 * Add the sql confirm. 2022-06-30 16:24:41 +08:00
hufangzhou ab1a43e1c6 * Change the xuan version. 2022-06-30 09:10:00 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
wangyidong 439f555e45 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-23 14:23:43 +08:00
孙广明 9bedfb86e4 * Add comment. 2022-06-23 14:19:05 +08:00
孙广明 a2b913d05f * Add upgrade logic. 2022-06-23 13:33:25 +08:00
mayue 243392a075 * Optimize code. 2022-06-23 13:27:22 +08:00
mayue 3591596462 * Optimize code. 2022-06-23 09:58:19 +08:00
mayue 1e8049788d * Optimize code. 2022-06-23 09:35:54 +08:00
mayue 2befa7a8ba * Add upgrade script. 2022-06-23 08:46:13 +08:00
mayue 6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
tianshujie c51a1ac5f8 * Fix bug #23855. 2022-06-16 16:33:04 +08:00
tianshujie b438c9882a * Fix bug #23855. 2022-06-16 16:31:01 +08:00
tianshujie 641c13383b * Fix bug #23855. 2022-06-16 16:06:55 +08:00
zhouxudong aedd5764a9 * Finish task #23554. 2022-06-14 01:58:37 +00:00
zhouxudong 1dded0473e * Fix bug #23554. 2022-06-13 06:47:08 +00:00
zhouxudong ca2f458c12 * Fix bug #23554. 2022-06-10 06:53:16 +00:00