Commit Graph
35729 Commits
Author SHA1 Message Date
孙广明 c947c2434d Merge branch 'zhouxin_fixbug' into 'master'
* Fix a bug.

See merge request easycorp/zentaopms!4808
2022-08-05 02:31:07 +00:00
王怡栋 7cbbcc9cad Merge branch 'lyk_25879' into 'master'
* Fix bug 25879.

See merge request easycorp/zentaopms!4792
2022-08-05 02:25:35 +00:00
tianshujie f4147a73a1 * Resolve issue #708. 2022-08-05 10:24:12 +08:00
liumengyi 18d1bc47fb * Fix issue #706. 2022-08-05 10:24:09 +08:00
liumengyi 3dc8d9c097 * Fix issue #710. 2022-08-05 10:18:43 +08:00
liumengyi 24a5917b4a * Fix issue #714. 2022-08-05 10:08:28 +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
lanzongjun 5da0f2df54 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-08-05 09:56:38 +08:00
lanzongjun 7e0c2a23ba fix 2022-08-05 09:56:28 +08:00
mayue 02e14250d5 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-05 09:49:54 +08:00
mayue 27645f9b6b * Optimize code. 2022-08-05 09:48:53 +08:00
tianshujie e6ddd61174 * Finish task #62948. 2022-08-05 09:36:56 +08:00
lanzongjun 6d52559fd3 fix 2022-08-05 09:26:49 +08:00
zhouxin d4f4f06117 * Delete useless param. 2022-08-05 01:25:59 +00:00
lanzongjun 4d1d86a898 fix 2022-08-05 09:05:36 +08:00
wangyuting2 9021138b70 * Adjust featurebar sort to config. 2022-08-05 09:01:31 +08:00
lanzongjun e6c7dc6986 remove ext 2022-08-05 09:01:04 +08:00
tianshujie 2132dd6bb5 * Fix bug #25944. 2022-08-05 08:59:07 +08:00
zhouxin 6c1f9f0568 * Fix a bug. 2022-08-05 00:52:40 +00:00
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +08:00
王怡栋 e5c57e1893 Merge branch 'master_liuhong_25419' into 'master'
*Fix bug #25419

See merge request easycorp/zentaopms!4801
2022-08-05 00:47:47 +00:00
wangyidong 1204fcf8db Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-05 08:46:32 +08: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
liuhong 0ab638d881 *Fix bug #25419 2022-08-05 00:42:04 +00:00
王怡栋 7269c3a85e Merge branch 'master_xieqiyu_26019' into 'master'
* Fix bug#26019.

See merge request easycorp/zentaopms!4805
2022-08-05 00:40:25 +00:00
xieqiyu f9f47e14cb * Fix bug#26019. 2022-08-05 08:32:27 +08:00
tanghucheng 28f896e84c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 08:11:14 +08:00
tanghucheng 289a559fa7 * Code for port. 2022-08-05 08:10:52 +08:00
liuyongkai 7ca2f66a28 * Fix bug #26002,25249 2022-08-04 10:26:46 +00:00
lanzongjun b74f03c924 fix bug 2022-08-04 17:58:48 +08:00
wangyidong 38b85c9262 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 17:26:56 +08:00
wangyidong a0a56c2b96 * fix bug #26064,26065. 2022-08-04 17:25:32 +08:00
liuhong ae08c74478 *Fix bug #25419 2022-08-04 08:32:54 +00:00
daitingting 73810a1e26 * Fix bug #25943. 2022-08-04 08:14:08 +00:00
liumengyi c9fc80ef4d * Fix bug #26025. 2022-08-04 15:50:40 +08:00
daitingting a292bc7438 * Add createdBy,createdDate fields in build table. 2022-08-04 07:39:24 +00:00
lanzongjun 43a2508122 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-08-04 15:34:50 +08:00
lanzongjun aa3b287d38 fix bug 2022-08-04 15:34:41 +08:00
王怡栋 b0079165da Merge branch 'sprint/221_tianshujie_25732' into 'master'
* Fix bug #25732.

See merge request easycorp/zentaopms!4798
2022-08-04 06:51:25 +00:00
tianshujie bfbc7b1e1b * Fixed style issues with deferred execution cards. 2022-08-04 14:49:16 +08:00
wangyuting2 f477e3cf1c * Add execution bug approval menu. 2022-08-04 14:48:51 +08:00
mayue f12ce8a55b * Fix bug . 2022-08-04 14:46:28 +08:00
tianshujie 202da1587e * Fix bug #25813. 2022-08-04 14:46:10 +08:00
tianshujie fb8185dd2b * Fix bug #25732. 2022-08-04 14:37:05 +08:00
王怡栋 2a03c9bfe3 Merge branch 'sprint/221_liumengyi_63455' into 'master'
* Finish task #63455.

See merge request easycorp/zentaopms!4797
2022-08-04 06:21:37 +00:00
tianshujie b73c5fb933 * Fix bug #25732. 2022-08-04 14:19:12 +08:00
tianshujie 02f02fc291 * Fix bug #25732. 2022-08-04 14:17:18 +08:00
胡方舟 ea3ce57b94 Merge branch 'sprint/221_dongli_62948' into 'master'
* Finish task #62948

See merge request easycorp/zentaopms!4796
2022-08-04 06:17:11 +00:00
tanghucheng 2b26be85d5 * Code for showimport view. 2022-08-04 14:10:49 +08:00