Commit Graph

28 Commits

Author SHA1 Message Date
王怡栋
e97e7ab9b5 * code for task #76034,76033. 2022-11-14 14:34:07 +08:00
zhujinyong
9ebd84ddcb + Add bi sql. 2022-08-15 10:09:32 +08:00
wangyidong
579d614d77 Merge branch 'sprint/devplat_31' 2022-08-11 14:12:44 +08: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
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
daitingting
088a414920 * Finish task #63896. 2022-08-09 09:21:43 +00:00
王怡栋
9e6111ad6c Merge branch 'master' into 'sprint/devplat_30'
# Conflicts:
#   db/update17.4.sql
2022-08-08 08:44:25 +00:00
wangyuting2
18bbd15427 * Remove a space. 2022-08-08 16:43:18 +08:00
wangyuting2
86bf5295b5 * Finish task #63908. 2022-08-08 15:41:00 +08:00
wangyidong
660c82b46e * adjust for change table engine in upgrade. 2022-08-08 14:05:50 +08:00
王怡栋
000038f12f Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4807
2022-08-05 01:58:16 +00:00
wangyidong
7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
lanzongjun
f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
daitingting
a292bc7438 * Add createdBy,createdDate fields in build table. 2022-08-04 07:39:24 +00:00
wangyidong
0ce2b35004 * fix for change table engine for upgrade. 2022-08-04 11:51:03 +08:00
wangyidong
d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong
f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
mayue
0ab5b2956d * Finish task #62892. 2022-08-04 09:07:37 +08:00
tianshujie
6661f80c81 * Fix bug #25984. 2022-08-03 14:19:00 +08:00
王怡栋
8675278f16 Merge branch 'master' into 'sprint/221_tianshujie_62940'
# Conflicts:
#   db/update17.4.sql
2022-08-03 01:35:27 +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
tianshujie
c13808d8df * Finish task #62943,62941,62940,62942. 2022-08-02 15:01:24 +08:00
daitingting
daa5ca846d * Add createdBy and createdDate in these tables. 2022-08-02 00:52:00 +00:00
mayue
62b3b33910 * Add update17.4.sql. 2022-08-01 16:53:49 +08:00