 朱金勇
|
5ff47f2bd4
|
Merge branch 'sprint/scx_api' into 'master'
* Fix api bug.
See merge request easycorp/zentaopms!4628
|
2022-07-22 02:35:20 +00:00 |
|
|
孙广明
|
815c633bc7
|
* Code for my-index speed.
|
2022-07-22 10:26:59 +08:00 |
|
|
王怡栋
|
c7d2661141
|
Merge branch 'master_liuhong_25436' into 'master'
*Fox bug 25436
See merge request easycorp/zentaopms!4633
|
2022-07-22 02:25:15 +00:00 |
|
|
王怡栋
|
86169fa19c
|
Merge branch 'cyy_bug' into 'master'
Cyy bug
See merge request easycorp/zentaopms!4631
|
2022-07-22 02:24:46 +00:00 |
|
|
王怡栋
|
0420767f2f
|
Merge branch 'sprint/217_25551' into 'master'
* Fix bug#25551,25591,25593
See merge request easycorp/zentaopms!4627
|
2022-07-22 02:20:54 +00:00 |
|
|
王怡栋
|
366a220180
|
Merge branch 'sprint/master_zhouxudong_61115' into 'master'
* Finish task #61115 #61114.
See merge request easycorp/zentaopms!4632
|
2022-07-22 02:14:07 +00:00 |
|
|
caoyanyi
|
eba899076d
|
* Modify merge param.
|
2022-07-22 10:05:29 +08:00 |
|
|
zenggang
|
c368f63f6d
|
* Adjust code
|
2022-07-22 02:01:47 +00:00 |
|
|
caoyanyi
|
ce572304aa
|
* Fix bug #25579.
|
2022-07-22 09:51:45 +08:00 |
|
|
liuhong
|
65aa0b2eee
|
*Fox bug 25436
|
2022-07-22 01:49:45 +00:00 |
|
|
caoyanyi
|
935c713a2e
|
* Modify commit param.
|
2022-07-22 09:31:55 +08:00 |
|
|
caoyanyi
|
272cef7585
|
* Fix bug #25583.
|
2022-07-22 09:28:20 +08:00 |
|
|
caoyanyi
|
5b73ba5f36
|
* Fix bug #25581.
|
2022-07-22 09:20:02 +08:00 |
|
|
caoyanyi
|
aee9970d4a
|
* Fix bug #25580.
|
2022-07-22 09:17:57 +08:00 |
|
|
zenggang
|
dba57b45cd
|
* Adjust code
|
2022-07-22 01:04:24 +00:00 |
|
|
王怡栋
|
71dd54df7a
|
Merge branch 'master_liuhong_24666' into 'master'
Master liuhong 24666
See merge request easycorp/zentaopms!4624
|
2022-07-22 01:01:47 +00:00 |
|
|
王怡栋
|
95a0ac4315
|
Merge branch 'cyy_24558' into 'master'
* Fix bug #24558.
See merge request easycorp/zentaopms!4625
|
2022-07-22 01:01:13 +00:00 |
|
|
wangyidong
|
1e800bbb5c
|
* fix bug #25600.
|
2022-07-22 08:53:27 +08:00 |
|
|
caoyanyi
|
26f7d5c2b6
|
* Fix bug #25576.
|
2022-07-22 08:39:11 +08:00 |
|
|
wangyidong
|
8acfb0b8df
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-22 08:30:31 +08:00 |
|
|
wangyidong
|
b9eca6ff93
|
* fix bug #25557.
|
2022-07-22 08:30:10 +08:00 |
|
|
孙广明
|
8e39468c6a
|
Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug #25554, #25558, #25559, #25570.
See merge request easycorp/zentaopms!4629
|
2022-07-21 09:41:20 +00:00 |
|
|
liumengyi
|
0d7bc07e69
|
* Optimize code for bug #25559.
|
2022-07-21 17:40:26 +08:00 |
|
|
孙广明
|
59a81e4466
|
Merge branch 'sprint/217_liumengyi_24337' into 'master'
* Fix bug #24337.
See merge request easycorp/zentaopms!4622
|
2022-07-21 09:39:30 +00:00 |
|
|
liumengyi
|
9be334f34b
|
* Fix bug #25554, #25558, #25559, #25570.
|
2022-07-21 17:38:27 +08:00 |
|
|
孙广明
|
6650fd9bad
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4630
|
2022-07-21 09:37:47 +00:00 |
|
|
tianshujie
|
4b59c7025a
|
* Fix page error problem.
|
2022-07-21 17:34:07 +08:00 |
|
|
liumengyi
|
14cf90f0e5
|
* Fix bug #25554, #25558, #25559, #25570.
|
2022-07-21 17:24:51 +08:00 |
|
|
caoyanyi
|
be04d6e492
|
* Adjust codes.
|
2022-07-21 17:09:26 +08:00 |
|
|
宋辰轩
|
99f4bb5877
|
* Add param.
|
2022-07-21 17:06:21 +08:00 |
|
|
宋辰轩
|
f82626dfab
|
* Fix api bug.
|
2022-07-21 17:05:38 +08:00 |
|
|
zenggang
|
2c2141e055
|
* Fix bug#25591,25593
|
2022-07-21 09:04:46 +00:00 |
|
|
wangyidong
|
a8e07852e8
|
* fix bug for contribute bug.
|
2022-07-21 17:02:28 +08:00 |
|
|
caoyanyi
|
aaeebc1abd
|
* Adjust codes.
|
2022-07-21 17:01:39 +08:00 |
|
|
wangyidong
|
ca3194e041
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-21 16:57:28 +08:00 |
|
|
wangyidong
|
6576f0ccc4
|
* fix bug #25531,25536,25541,25550,25552,25561
|
2022-07-21 16:56:14 +08:00 |
|
|
zhouxudong
|
098c3ae333
|
* Finish task #61115 #61114.
|
2022-07-21 08:52:50 +00:00 |
|
|
tianshujie
|
06b864abf4
|
* Remove redundant parameters.
|
2022-07-21 16:39:43 +08:00 |
|
|
zenggang
|
27e19c459a
|
* Fix bug#25551
|
2022-07-21 08:23:50 +00:00 |
|
|
朱金勇
|
e938a86fb5
|
Merge branch 'sprint/sunhao/zui_table' into 'master'
* update zui table, optimize UI for nested mode.
See merge request easycorp/zentaopms!4626
|
2022-07-21 08:21:43 +00:00 |
|
|
Hao Sun
|
be417874c2
|
* update zui table, optimize UI for nested mode.
|
2022-07-21 07:03:08 +00:00 |
|
|
孙广明
|
41c90492e6
|
Merge branch 'sprint/217_zg_bugs' into 'master'
* Fix sprint217 bugs.
See merge request easycorp/zentaopms!4623
|
2022-07-21 06:06:03 +00:00 |
|
|
caoyanyi
|
0eba61ac66
|
* Fix bug #24750.
|
2022-07-21 13:58:39 +08:00 |
|
|
caoyanyi
|
28ce2717db
|
* Fix bug #24582.
|
2022-07-21 13:28:26 +08:00 |
|
|
caoyanyi
|
df93073fe4
|
* Fix bug #24576.
|
2022-07-21 13:24:43 +08:00 |
|
|
caoyanyi
|
cb09c1e3ff
|
* Fix bug #24558.
|
2022-07-21 13:19:29 +08:00 |
|
|
孙广明
|
49517aec09
|
* Modify execution-all default param.
|
2022-07-21 13:13:43 +08:00 |
|
|
王怡栋
|
dcd013186a
|
Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug
See merge request easycorp/zentaopms!4620
|
2022-07-21 05:08:47 +00:00 |
|
|
liuhong
|
e858799e11
|
*Fix bug #24666
|
2022-07-21 04:23:38 +00:00 |
|
|
liuhong
|
25a0350108
|
* Fix bug#24666.
|
2022-07-21 04:20:57 +00:00 |
|