Commit Graph

169 Commits

Author SHA1 Message Date
mayue
37125b72bc * Finish task #55175. 2022-05-24 07:34:38 +00:00
hufangzhou
90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
tanghucheng
f67e77e4e6 * Fix bug for gantt. 2022-04-29 13:17:26 +08:00
tanghucheng
650db6bbf6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-04-28 16:49:58 +08:00
tanghucheng
ebde9241cf * Fix bug. 2022-04-28 16:49:03 +08:00
孙广明
e3ff7b36e6 * Fix bug #14997. 2022-04-28 13:28:09 +08:00
zenggang
f81b53bc38 * Fix bug#2942,15431,21981 2022-04-27 07:23:08 +00:00
wangyidong
701d007a9f * code for bug #22030. 2022-04-27 13:40:47 +08:00
李玉春
fe221fec43 Merge branch 'bug_21982' into 'master'
Fix bug#21982,21983,21981

See merge request easycorp/zentaopms!3122
2022-04-26 08:09:06 +00:00
zenggang
7688d211d3 * Fix bug#21981 2022-04-26 06:21:15 +00:00
tanghucheng
44fe7084c0 * Fix bug #10877. 2022-04-26 10:35:50 +08:00
tanghucheng
cbec525102 * Fix bug #17602. 2022-04-24 13:55:08 +08:00
王怡栋
f8ef430ad6 * fix error. 2022-04-22 10:59:30 +08:00
王怡栋
89e1854932 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-21 15:39:05 +08:00
王怡栋
7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
王怡栋
c5f4ad704e Merge branch 'fixbug' into 'master'
* Fix bug #19142.

See merge request easycorp/zentaopms!3041
2022-04-21 01:34:48 +00:00
王怡栋
54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
tanghucheng
12ebbad5c3 * Fix bug #19142. 2022-04-20 05:25:50 +00:00
xieqiyu
f100564e6a * Fix bug#21848. 2022-04-19 17:08:49 +08:00
xieqiyu
843c14c894 * Fix bug#6948. 2022-04-06 08:46:23 +08:00
tianshujie
b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
xieqiyu
e52f5c78b7 * Fix bug#21037. 2022-03-23 14:57:59 +08:00
zhouxin
30523ec374 Fix bug #17943. 2022-03-22 06:48:55 +00:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
李玉春
0e26c165c2 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
pailei2_sunhuawei_50407

See merge request easycorp/zentaopms!2319
2022-03-17 01:31:38 +00:00
孙华伟
9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
zhujinyong
489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
mayue
24320d7dc3 * Optimize code. 2022-03-16 08:30:41 +08:00
mayue
38d281825c * Fix bug #18395. 2022-03-15 16:41:04 +08:00
孙广明
6a6af4e1a2 * Fix weekly bug. 2022-03-13 15:08:54 +08:00
liumengyi
084d882f9b * Fix bug #50341. 2022-03-08 10:07:42 +08:00
孙广明
62f755c3b2 * Finish task #50341. 2022-03-07 15:28:52 +08:00
liumengyi
119fde1713 * Finish task #50341. 2022-03-07 13:56:51 +08:00
hufangzhou
59181566ff * Move the gantt extension file to common/view. 2022-03-02 13:22:53 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
孙广明
30f5033357 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18201.

See merge request easycorp/zentaopms!1269
2022-01-05 06:48:31 +00:00
zhouxin
d34b83cd96 Fix bug #18201. 2022-01-05 05:54:10 +00:00
zhouxin
ee431f18e3 Fix bug #18199. 2022-01-05 05:09:08 +00:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhouxin
68f27d5fd8 Change geshi. 2022-01-04 07:48:11 +00:00
zhouxin
d44067f4e6 Fix a bug. 2022-01-04 07:31:20 +00:00
zhouxin
68647da31c Finish task #46683. 2022-01-04 01:57:16 +00:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
zhouxin
2e79c5f869 Finish task #46679 and fix a bug. 2021-12-29 03:49:17 +00:00
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
tanghucheng
d97494e257 * Code for stage. 2021-12-15 11:14:15 +08:00
tanghucheng
b64b4cfc6f * Code for task #45806. 2021-12-13 09:37:38 +08:00
tanghucheng
d556f52381 * Finish task #45806. 2021-12-10 16:11:06 +08:00