 孙广明
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
lanzongjun
|
1ae1352f11
|
* finish task #62889
|
2022-08-03 09:28:39 +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 |
|
|
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 |
|