 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 |
|
|
liumengyi
|
1fe596b022
|
* Fix bug #25994.
|
2022-08-03 17:17:16 +08:00 |
|
|
liumengyi
|
5acd4b9127
|
* Fix bug #25994.
|
2022-08-03 17:12:07 +08:00 |
|
|
liuruogu
|
a28d225da9
|
* Finish task #63381.
|
2022-08-03 08:21:44 +00:00 |
|
|
zenggang
|
3a9f4d8ada
|
* Fix bug#25897,22882
|
2022-08-03 07:16:28 +00:00 |
|
|
liuruogu
|
feb04dd1cd
|
* Finish task #63384.
|
2022-08-03 06:48:05 +00:00 |
|
|
王怡栋
|
1d59e34b07
|
Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg
See merge request easycorp/zentaopms!4751
|
2022-08-03 02:12:38 +00:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
liumengyi
|
de29183b2c
|
* Finish task #62944.
|
2022-08-01 16:16:25 +08:00 |
|
|
zenggang
|
56b4e30328
|
* Code for task#61964
|
2022-07-27 06:45:26 +00:00 |
|
|
王怡栋
|
8eb24df570
|
Merge branch 'sprint220_zg_61964' into 'master'
Sprint220 zg 61964
See merge request easycorp/zentaopms!4663
|
2022-07-27 02:05:06 +00:00 |
|
|
zenggang
|
4bd33b9cba
|
* Adjust code
|
2022-07-27 01:53:26 +00:00 |
|
|
liumengyi
|
174d226f86
|
* Fix bug #62026.
|
2022-07-26 14:53:15 +08:00 |
|
|
tianshujie
|
5818db887f
|
* Fix bug #25122.
|
2022-07-22 10:28:42 +08:00 |
|
|
tianshujie
|
f32443218c
|
* Fix bug #25461.
|
2022-07-21 09:56:25 +08:00 |
|
|
王怡栋
|
9fbcd9113c
|
Merge branch 'sprint/215_liumengyi_25386' into 'master'
* Fix bug #25386.
See merge request easycorp/zentaopms!4587
|
2022-07-15 07:09:55 +00:00 |
|
|
liumengyi
|
3c974558c1
|
* Fix bug #25386.
|
2022-07-15 15:03:01 +08:00 |
|
|
tianshujie
|
c0c21bc75d
|
* Fix bug #25321.
|
2022-07-15 14:39:35 +08:00 |
|
|
孙广明
|
cb01084a13
|
Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.
See merge request easycorp/zentaopms!4579
|
2022-07-15 06:17:32 +00:00 |
|
|
孙广明
|
900e2342a2
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4582
|
2022-07-15 06:16:50 +00:00 |
|
|
liumengyi
|
c38e03a604
|
* Fix bug #25200.
|
2022-07-15 14:07:49 +08:00 |
|
|
tianshujie
|
656cc5f060
|
* Fix bug #25321.
|
2022-07-15 14:07:32 +08:00 |
|
|
孙广明
|
c04d08210a
|
* Code for php error.
|
2022-07-15 10:56:52 +08:00 |
|
|
孙广明
|
4617c3a040
|
Merge branch 'fixbug_25202' into 'master'
fixbug_25202
See merge request easycorp/zentaopms!4564
|
2022-07-15 01:22:47 +00:00 |
|
|
sunjun
|
d375ccf6a3
|
fixbug_25202
|
2022-07-15 01:12:58 +00:00 |
|
|
孙广明
|
6b19ed146d
|
Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268
See merge request easycorp/zentaopms!4547
|
2022-07-14 07:24:17 +00:00 |
|
|
tianshujie
|
711c0e9e8c
|
* Fix bug #25088.
|
2022-07-14 14:46:46 +08:00 |
|
|
孙广明
|
083ebb7f29
|
* Fix stage-task tree list bug.
|
2022-07-14 13:29:23 +08:00 |
|
|
sunjun
|
a40ae1ee63
|
fixbug_25216
|
2022-07-14 01:43:36 +00:00 |
|
|
sunjun
|
51fe9cc511
|
fixbug_25216
|
2022-07-14 01:22:53 +00:00 |
|
|
sunjun
|
63ee113190
|
fixbug_25216
|
2022-07-14 00:44:15 +00:00 |
|
|
liumengyi
|
51dd442c01
|
* Fix bug #23641.
|
2022-07-13 14:51:38 +08:00 |
|
|
liumengyi
|
db19c66db3
|
* Fix bug #23641.
|
2022-07-13 14:45:15 +08:00 |
|
|
孙广明
|
d8e313669e
|
Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474
See merge request easycorp/zentaopms!4503
|
2022-07-13 05:10:46 +00:00 |
|
|
sunjun
|
0c7767c3c5
|
60474
|
2022-07-13 04:31:32 +00:00 |
|
|
孙广明
|
105ac0b70f
|
Merge branch 'stagetasktree'
|
2022-07-13 08:48:30 +08:00 |
|
|
孙广明
|
5264032497
|
* Finish executio task tree.
|
2022-07-13 08:48:00 +08:00 |
|
|
孙广明
|
bd9700212c
|
* Finish task #59706.
|
2022-07-12 22:48:07 +08:00 |
|
|
sunjun
|
d1d49fe404
|
sprint/211_sunjun_60474
|
2022-07-12 02:03:53 +00:00 |
|
|
sunjun
|
1404449da1
|
sprint/211_sunjun_60474
|
2022-07-11 09:09:29 +00:00 |
|
|
刘刚
|
ff94cac738
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24898.
See merge request easycorp/zentaopms!4399
|
2022-07-07 02:36:20 +00:00 |
|
|
daitingting
|
cfc20958d0
|
* Fix bug #24903.
|
2022-07-07 02:35:55 +00:00 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
刘刚
|
d3174ab36c
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4368
|
2022-07-06 03:07:19 +00:00 |
|
|
liumengyi
|
6464887f89
|
* Fix bug #24753.
|
2022-07-06 08:42:21 +08:00 |
|
|
daitingting
|
be44e76cb9
|
* Finish task #59646.
|
2022-07-05 09:20:47 +00:00 |
|
|
zhouxudong
|
b9ee65ddfd
|
* Fix bug #24751.
|
2022-07-05 06:54:04 +00:00 |
|
|
王怡栋
|
a6916a73c5
|
Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527
See merge request easycorp/zentaopms!4326
|
2022-07-05 02:07:26 +00:00 |
|
|
王怡栋
|
4e1f22be8a
|
Merge branch 'sprint/212_zhouxudong_59542' into 'master'
Sprint/212 zhouxudong 59542
See merge request easycorp/zentaopms!4321
|
2022-07-04 07:50:04 +00:00 |
|