Commit Graph
846 Commits
Author SHA1 Message Date
liuruogu f488c11146 * Fix bug #26456. 2022-08-15 09:23:06 +00:00
wangyidong ab98851096 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:43:33 +08:00
wangyidong a7da22c833 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:42:20 +08:00
hufangzhou f28a05f25b * Add the xuanxuan update sql to standard sql. 2022-08-12 16:40:51 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
hufangzhou c7f587ef5a * Fix bug #26359. Optimize detail styles for creating documents. 2022-08-12 15:05:00 +08:00
wangyidong 1d1379392a * adjust for merge program. 2022-08-12 08:34:37 +08:00
wangyidong 02bab0a206 Merge branch 'sprint/devplat_31' 2022-08-11 15:21:36 +08:00
daitingting 5f9da4f6ec * Adjust upgrade version. 2022-08-11 07:17:44 +00:00
daitingting 145b7d2bc5 * Update defalut likages for approval review. 2022-08-11 06:57:44 +00:00
wangyidong 579d614d77 Merge branch 'sprint/devplat_31' 2022-08-11 14:12:44 +08:00
liuruogu 64acdb8693 * Fix bug #26173. 2022-08-11 05:53:27 +00:00
liuruogu 5a6d41baed * Fix bug #26173. 2022-08-11 05:47:19 +00:00
daitingting bbf17e6bff * Add flow fields when upgrade from biz7.3. 2022-08-11 03:22:42 +00:00
wangyidong 36ddb50872 Merge branch 'sprint/devplat_31' 2022-08-10 14:57:25 +08:00
wangyidong f55aec696c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-10 14:54:02 +08:00
wangyuting2 964e64efe1 * Finish task #63892. 2022-08-10 14:14:56 +08:00
王怡栋 48c40b633f Merge branch 'sprint/devplat_31' into 'master'
* Fix bug #26173.

See merge request easycorp/zentaopms!4891
2022-08-10 06:02:48 +00:00
liuruogu 64a77e3075 * Fix bug #26173. 2022-08-10 06:01:37 +00:00
liuruogu e05e56ee70 * Fix bug #26173. 2022-08-10 05:16:15 +00:00
zenggang dcacaa5cea * Adjust code 2022-08-10 03:09:50 +00:00
zenggang 20f40c7b85 * Finish task#63690,63693 2022-08-09 08:44:37 +00:00
wangyidong 402d439ee0 * fix bug #26164. 2022-08-09 10:52:08 +08:00
王怡栋 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