Commit Graph
1500 Commits
Author SHA1 Message Date
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
liyuchun a9b8582cc9 * Add cron task. 2022-08-25 08:57:01 +08:00
liyuchun b2189bf529 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-25 08:55:31 +08:00
liyuchun 0f1d8abfdf * Add filed in zt_job. 2022-08-25 08:55:18 +08:00
xieqiyu 1db00037b4 * * Modify update sql of change story status. 2022-08-24 10:05:49 +08:00
xieqiyu bd510fe0d4 * Fix bug of update story datetable. 2022-08-23 10:11:31 +08:00
xieqiyu 64b9c8d35e * Delete unused code. 2022-08-22 17:41:29 +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
liyuchun 806bc627ed * Remove sql. 2022-08-19 16:00:49 +08:00
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
#   db/update17.5.sql
2022-08-19 02:34:50 +00:00
李玉春 6399c58056 Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976

See merge request easycorp/zentaopms!5017
2022-08-18 09:57:34 +00:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
tianshujie 399f6b53d9 * Finish task #64967. 2022-08-18 15:08:07 +08:00
tianshujie 9f468e6d24 * Finish task #64976. 2022-08-18 14:35:19 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
liyuchun 9da91f6d91 * Add update sql. 2022-08-18 13:21:12 +08:00
liyuchun 2ccdc2c118 * Edit db file name. 2022-08-18 13:20:10 +08:00
王怡栋 c7824fef1a Merge branch 'sprint/zentaomax42' into 'max42_tanghucheng'
# Conflicts:
#   db/update17.5.sql
2022-08-18 02:45:56 +00: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
王怡栋 bff1d42c2f Merge branch 'sprint/zentaomax42_lanzongjun' into 'sprint/zentaomax42'
* finish task #64943

See merge request easycorp/zentaopms!4997
2022-08-18 01:57:13 +00:00
tanghucheng 556bdd9cbc * Add feedback repeatFeedback field. 2022-08-18 09:34:45 +08:00
lanzongjun c28e0748dd * finish task #64943 2022-08-17 16:39:55 +08:00
caoyanyi 8c1a24d3b5 Merge branch 'master' into zenops_41 2022-08-17 16:03:23 +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
wangyidong 97700ca723 * fix for MYISAM to InnoDB. 2022-08-16 08:27:17 +08:00
xieqiyu d9a8156b76 * Modify changing process. 2022-08-15 22:03:08 +08:00
tianshujie 6bd27a7aeb * Finish task #63687. 2022-08-15 19:33:12 +08:00
hufangzhou 81c1e5b6e7 * Add the BI sql to standard sql. 2022-08-15 13:24:04 +08:00
hufangzhou f98716d88f * Add the xuan update sql to zentao.sql. 2022-08-15 10:53:56 +08: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
zhujinyong 9ebd84ddcb + Add bi sql. 2022-08-15 10:09:32 +08:00
liyuchun a4b8a6eba2 Merge branch 'master' into zenops_41 2022-08-15 09:38:48 +08:00
hufangzhou f28a05f25b * Add the xuanxuan update sql to standard sql. 2022-08-12 16:40:51 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
caoyanyi e45d44ccaa Merge branch 'master' into zenops_41 2022-08-11 16:04:36 +08:00
王怡栋 61f3904ff0 Merge branch 'sprint/devplat_31' into 'master'
* Add flow fields when upgrade from biz7.3.

See merge request easycorp/zentaopms!4922
2022-08-11 05:20:51 +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
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
孙广明 0ce4f4dd1d Merge branch 'liyuchun_64397' into 'zenops_41'
* Finish task #64269.

See merge request easycorp/zentaopms!4897
2022-08-11 00:20:46 +00:00
wangyidong 36ddb50872 Merge branch 'sprint/devplat_31' 2022-08-10 14:57:25 +08:00
liyuchun 273698d8e6 * Finish task #64269. 2022-08-10 06:54:20 +00:00
wangyuting2 964e64efe1 * Finish task #63892. 2022-08-10 14:14:56 +08:00
tanghucheng b1544eb12e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_task 2022-08-10 12:46:22 +08:00
tanghucheng 52cad31920 * Code for port. 2022-08-10 12:37:14 +08:00