 tianshujie
|
06304fa5fb
|
* Resolved issue #705.
|
2022-08-05 11:28:39 +08:00 |
|
|
王怡栋
|
586474de6c
|
Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26001, #26033.
See merge request easycorp/zentaopms!4815
|
2022-08-05 03:19:49 +00:00 |
|
|
liumengyi
|
1513fb7afb
|
* Fix bug #26001.
|
2022-08-05 11:14:14 +08:00 |
|
|
liumengyi
|
54bca1b907
|
* Fix bug #26033.
|
2022-08-05 11:01:01 +08:00 |
|
|
王怡栋
|
351b8f37f5
|
Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #25978, #25968, #26020.
See merge request easycorp/zentaopms!4814
|
2022-08-05 02:51:24 +00:00 |
|
|
王怡栋
|
06031a7f7e
|
Merge branch 'sprint/221_tianshujie_25944' into 'master'
* Fix bug #25944.
See merge request easycorp/zentaopms!4811
|
2022-08-05 02:50:51 +00:00 |
|
|
liumengyi
|
175a703f11
|
* Fix bug #26020.
|
2022-08-05 10:49:10 +08:00 |
|
|
王怡栋
|
e74990bd86
|
Merge branch 'sprint/221_dongli_bug25979' into 'master'
* Fix bug #25979.
See merge request easycorp/zentaopms!4812
|
2022-08-05 02:49:05 +00:00 |
|
|
tianshujie
|
926f41277f
|
* Fix bug #25944.
|
2022-08-05 10:48:08 +08:00 |
|
|
王怡栋
|
da4c3895e1
|
Merge branch 'sprint/221_liumengyi_714' into 'master'
* Fix issue #714,#710, #706.
See merge request easycorp/zentaopms!4809
|
2022-08-05 02:40:22 +00:00 |
|
|
liumengyi
|
b43a153974
|
* Fix bug #25978.
|
2022-08-05 10:39:33 +08:00 |
|
|
liumengyi
|
f33721b4a9
|
* Fix bug #25978.
|
2022-08-05 10:38:23 +08:00 |
|
|
liumengyi
|
4244b98ec1
|
* Fix issue #714.
|
2022-08-05 10:37:33 +08:00 |
|
|
dongli
|
2d31852f07
|
* Fix bug #25979.
|
2022-08-05 02:34:38 +00:00 |
|
|
王怡栋
|
3cc4c75950
|
Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue
See merge request easycorp/zentaopms!4810
|
2022-08-05 02:34:09 +00:00 |
|
|
孙广明
|
7cc56886e3
|
Merge branch 'lyk_25876' into 'master'
* Fix bug 25876.
See merge request easycorp/zentaopms!4793
|
2022-08-05 02:32:36 +00:00 |
|
|
孙广明
|
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 |
|
|
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
|
aca14bafc6
|
remove ext
|
2022-08-05 08:50:17 +08: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 |
|
|
李玉春
|
8209f2919f
|
Merge branch 'cyy_test' into 'master'
* Add gitlab test case.
See merge request easycorp/zentaopms!4804
|
2022-08-05 00:33:18 +00:00 |
|
|
xieqiyu
|
f9f47e14cb
|
* Fix bug#26019.
|
2022-08-05 08:32:27 +08:00 |
|
|
caoyanyi
|
8339988621
|
* Modify result.
|
2022-08-05 08:28:39 +08:00 |
|
|
caoyanyi
|
bfa16033d1
|
* Add gitlab test case.
|
2022-08-05 08:26:59 +08:00 |
|
|
lanzongjun
|
b74f03c924
|
fix bug
|
2022-08-04 17:58:48 +08:00 |
|
|
wangyidong
|
aaee558b83
|
* code for task #62742.
|
2022-08-04 17:30:27 +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 |
|