Commit Graph
868 Commits
Author SHA1 Message Date
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
tanghucheng bbd1c4ea5e * Fix bug #26617. 2022-08-24 17:05:46 +08:00
xieqiyu 840e0dd810 * Delete unused code. 2022-08-24 10:10:04 +08:00
xieqiyu 1db00037b4 * * Modify update sql of change story status. 2022-08-24 10:05:49 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
xieqiyu a1212a5a8b * * Add upgrade sql and the function of updateStoryStatus. 2022-08-22 16:43:36 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
tianshujie 060a2d9df0 * Finish task #64967. 2022-08-22 10:01:53 +08:00
liumengyi ee19dd6d4a * Fix bug for task #64967. 2022-08-22 09:22:39 +08:00
tianshujie 0b1327902b * Finish task #63696. 2022-08-19 14:45:10 +08:00
liumengyi ea5d22cc05 * Finish task #64967 for upgrade. 2022-08-18 16:49:22 +08:00
tianshujie 8287baa6dc * Finish task #63696. 2022-08-18 10:45:58 +08:00
tianshujie 46071ffaec * Finish task #63696. 2022-08-18 10:42:06 +08:00
tianshujie 9cd4212ef7 i* Finish task #63696. 2022-08-18 10:23:41 +08:00
tianshujie 0ea6aa7b27 * Finish task #63696. 2022-08-18 10:04:09 +08:00
王怡栋 fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
tianshujie 64c7f8dc23 * Finish task #63687. 2022-08-17 13:15:35 +08:00
tianshujie da87f21a39 * Finish task #63687. 2022-08-16 19:24:24 +08:00
tianshujie 2e8cc2c19f * Restore code. 2022-08-15 19:37:05 +08:00
liuruogu f488c11146 * Fix bug #26456. 2022-08-15 09:23:06 +00:00
tianshujie 4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08: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
tianshujie 4cc14dfe59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-11 11:04:58 +08: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
tianshujie 1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08: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