 孙广明
|
ef27964ad2
|
Merge branch 'lyk_25690' into 'master'
* Fix bug 25690.
See merge request easycorp/zentaopms!4841
|
2022-08-08 08:30:21 +00:00 |
|
|
liuyongkai
|
327336b7bf
|
* Fix bug 25690.
|
2022-08-08 05:59:13 +00:00 |
|
|
tanghucheng
|
36b07367c9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-08 12:07:23 +08:00 |
|
|
王怡栋
|
ed951dc12e
|
Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade
See merge request easycorp/zentaopms!4835
|
2022-08-08 03:25:42 +00:00 |
|
|
tanghucheng
|
d71cb4dd67
|
* Code for port.
|
2022-08-08 11:07:36 +08:00 |
|
|
mayue
|
b338d96743
|
* Optimize code.
|
2022-08-08 10:41:26 +08:00 |
|
|
mayue
|
fc13fad289
|
resolve conflict
|
2022-08-08 10:39:25 +08:00 |
|
|
lanzongjun
|
8adc70569f
|
fix
|
2022-08-05 14:21:04 +08:00 |
|
|
tanghucheng
|
3bfdc7d342
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 13:07:31 +08:00 |
|
|
孙广明
|
9f323c631a
|
Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249
See merge request easycorp/zentaopms!4816
|
2022-08-05 03:34:42 +00:00 |
|
|
liuyongkai
|
eef158bcb6
|
* Fix bug 26002,25249
|
2022-08-05 03:32:47 +00:00 |
|
|
liuyongkai
|
697ecffce7
|
* Fix bug #26002,25249
|
2022-08-05 03:29:29 +00:00 |
|
|
liuyongkai
|
8837c4c100
|
* Fix bug $26002,25249
|
2022-08-05 03:08:10 +00: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 |
|
|
liumengyi
|
f33721b4a9
|
* Fix bug #25978.
|
2022-08-05 10:38:23 +08:00 |
|
|
liumengyi
|
3dc8d9c097
|
* Fix issue #710.
|
2022-08-05 10:18:43 +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 |
|
|
lanzongjun
|
6d52559fd3
|
fix
|
2022-08-05 09:26:49 +08:00 |
|
|
lanzongjun
|
4d1d86a898
|
fix
|
2022-08-05 09:05:36 +08:00 |
|
|
lanzongjun
|
e6c7dc6986
|
remove ext
|
2022-08-05 09:01:04 +08:00 |
|
|
lanzongjun
|
fa254f518e
|
resolve conflict
|
2022-08-05 08:49:49 +08:00 |
|
|
lanzongjun
|
f241846903
|
resolve conflict
|
2022-08-05 08:43:09 +08:00 |
|
|
liuyongkai
|
7ca2f66a28
|
* Fix bug #26002,25249
|
2022-08-04 10:26:46 +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 |
|
|
mayue
|
f12ce8a55b
|
* Fix bug .
|
2022-08-04 14:46:28 +08:00 |
|
|
tanghucheng
|
5f4699ceec
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-04 14:10:36 +08:00 |
|
|
mayue
|
63c9e6a6c0
|
* Fix bug .
|
2022-08-04 14:08:43 +08:00 |
|
|
mayue
|
436cf26588
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade
|
2022-08-04 13:07:42 +08:00 |
|
|
lanzongjun
|
9baa2fba54
|
* fix bug
|
2022-08-04 13:06:17 +08:00 |
|
|
mayue
|
58567b28e7
|
* Finish task #62887.
|
2022-08-04 11:09:48 +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
|
37c49204e1
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade
|
2022-08-04 09:09:53 +08:00 |
|
|
mayue
|
0ab5b2956d
|
* Finish task #62892.
|
2022-08-04 09:07:37 +08:00 |
|
|
tanghucheng
|
a8fbdff6ba
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-04 00:03:14 +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 |
|
|
tanghucheng
|
1c730049d1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-03 14:11:48 +08:00 |
|
|
liumengyi
|
1247155cc1
|
* Fix bug #25978.
|
2022-08-03 13:27:05 +08: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 |
|
|
lanzongjun
|
1ae1352f11
|
* finish task #62889
|
2022-08-03 09:28:39 +08:00 |
|
|
tanghucheng
|
08073876bd
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-02 17:50:50 +08:00 |
|
|
lanzongjun
|
f47ab8a359
|
* finish task #62889
|
2022-08-02 17:18:24 +08:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
tanghucheng
|
4da40b6021
|
* Code for task config.
|
2022-08-02 08:52:47 +08:00 |
|