 王怡栋
|
3e537ee455
|
Merge branch 'sprint/211_liumengyi_24910' into 'master'
* Fix bug #24910.
See merge request easycorp/zentaopms!4387
|
2022-07-06 09:23:47 +00:00 |
|
|
liumengyi
|
7c7a7689d6
|
* Fix bug #24910.
|
2022-07-06 17:23:17 +08:00 |
|
|
liumengyi
|
92fbca540e
|
* Fix bug #24910.
|
2022-07-06 17:20:54 +08:00 |
|
|
wangyidong
|
16663dee7f
|
* fix bug #24818.
|
2022-07-06 17:17:28 +08:00 |
|
|
刘刚
|
e7767459f2
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4385
|
2022-07-06 09:08:05 +00:00 |
|
|
孙广明
|
5a30bcc5fe
|
Merge branch 'sprint212_leiyong_task_59520' into 'master'
Sprint212 leiyong task 59520
See merge request easycorp/zentaopms!4341
|
2022-07-06 09:07:29 +00:00 |
|
|
zenggang
|
4825e51b78
|
* Adjust cfd css
|
2022-07-06 09:04:56 +00:00 |
|
|
李玉春
|
0842185bfc
|
Merge branch 'cyy_repo' into 'master'
Cyy repo
See merge request easycorp/zentaopms!4376
|
2022-07-06 09:01:15 +00:00 |
|
|
王怡栋
|
ee7f594ce0
|
Merge branch 'sprint/211_tianshujie_59476' into 'master'
Sprint/211 tianshujie 59476
See merge request easycorp/zentaopms!4383
|
2022-07-06 08:25:03 +00:00 |
|
|
caoyanyi
|
6c4a58b1a0
|
* Adjust codes.
|
2022-07-06 16:02:50 +08:00 |
|
|
tianshujie
|
4aaaa2be85
|
* Finish task #59476.
|
2022-07-06 15:56:48 +08:00 |
|
|
mayue
|
fbb92627b8
|
* Fix bug #24832.
|
2022-07-06 15:51:28 +08:00 |
|
|
lanzongjun
|
d664bc44b0
|
* fix bug #24785
|
2022-07-06 15:39:33 +08:00 |
|
|
tianshujie
|
2e74516127
|
* Finish task #59476.
|
2022-07-06 15:06:05 +08:00 |
|
|
liuruogu
|
5aabaa4c1e
|
* Fix bug #24782.
|
2022-07-06 07:03:56 +00:00 |
|
|
孙广明
|
c97ff18621
|
Merge branch 'master' into 'sprint213_zg'
# Conflicts:
# module/execution/css/cfd.css
# module/execution/js/cfd.js
|
2022-07-06 07:02:38 +00:00 |
|
|
孙广明
|
48aa86d1d1
|
Merge branch 'sprint/213_mayue_bug#24811#24814' into 'master'
* Fix bug #24811#24814.
See merge request easycorp/zentaopms!4380
|
2022-07-06 07:00:02 +00:00 |
|
|
mayue
|
ef88d29c90
|
* Fix bug #24811#24814.
|
2022-07-06 14:58:46 +08:00 |
|
|
zenggang
|
4c0375925c
|
* Adjust code
|
2022-07-06 06:58:25 +00:00 |
|
|
zenggang
|
9fd03b84f2
|
* Adjust code
|
2022-07-06 06:47:31 +00:00 |
|
|
王怡栋
|
f25fcc1eb2
|
Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
# module/testcase/css/create.css
|
2022-07-06 06:47:25 +00:00 |
|
|
王怡栋
|
1eec0e603f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24806
See merge request easycorp/zentaopms!4369
|
2022-07-06 06:45:43 +00:00 |
|
|
zenggang
|
b1d6a4a93d
|
* Adjust code
|
2022-07-06 06:44:54 +00:00 |
|
|
lanzongjun
|
d6a387935f
|
* fix bug #24813
|
2022-07-06 14:44:36 +08:00 |
|
|
zenggang
|
8773257051
|
* Finish task#59703,59711
|
2022-07-06 06:42:19 +00:00 |
|
|
tianshujie
|
16a8bcf5f6
|
* Finish task #58557.
|
2022-07-06 14:40:42 +08:00 |
|
|
caoyanyi
|
f7bb57b869
|
* Remove unused code.
|
2022-07-06 14:25:28 +08:00 |
|
|
王怡栋
|
1653df17fd
|
Merge branch 'sprint/master_zhouxudong_24736' into 'master'
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
See merge request easycorp/zentaopms!4375
|
2022-07-06 06:24:30 +00:00 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
王怡栋
|
14b88ef75e
|
Merge branch 'sprint/211_liumengyi_59469' into 'master'
* Finish task #59469.
See merge request easycorp/zentaopms!4372
|
2022-07-06 06:17:57 +00:00 |
|
|
caoyanyi
|
17eda754f9
|
* Fix bug #24829.
|
2022-07-06 14:17:25 +08:00 |
|
|
liumengyi
|
100f1daf7e
|
* Add annotation.
|
2022-07-06 14:10:37 +08:00 |
|
|
王怡栋
|
bb859c6261
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24843.
See merge request easycorp/zentaopms!4373
|
2022-07-06 06:08:40 +00:00 |
|
|
孙广明
|
84876b851d
|
* Fix cfd line style.
|
2022-07-06 14:05:52 +08:00 |
|
|
王怡栋
|
b6b2035566
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4371
|
2022-07-06 06:05:06 +00:00 |
|
|
王怡栋
|
26a087a069
|
Merge branch 'sprint/hufangzhou_ciPipline' into 'master'
* Change the ci release path and Modify the xuanxuan upgrade program.
See merge request easycorp/zentaopms!4374
|
2022-07-06 06:04:22 +00:00 |
|
|
hufangzhou
|
f5eb826556
|
* Change the ci release path and Modify the xuanxuan upgrade program.
|
2022-07-06 14:02:59 +08:00 |
|
|
caoyanyi
|
5e883406fe
|
* Fix bug #24847.
|
2022-07-06 14:02:33 +08:00 |
|
|
caoyanyi
|
becc67abda
|
* Modify download code style.
|
2022-07-06 13:52:16 +08:00 |
|
|
liumengyi
|
fae194b655
|
* Remove blank line.
|
2022-07-06 13:46:42 +08:00 |
|
|
孙广明
|
69ec58a361
|
Merge branch 'sprint_59471' into 'master'
Sprint 59471
See merge request easycorp/zentaopms!4370
|
2022-07-06 05:46:33 +00:00 |
|
|
caoyanyi
|
36427cc048
|
* Fix bug #24820.
|
2022-07-06 13:45:45 +08:00 |
|
|
caoyanyi
|
7a3fda688a
|
* Fix bug #24800.
|
2022-07-06 13:45:26 +08:00 |
|
|
liumengyi
|
ead37d6de6
|
* Fix bug #24843.
|
2022-07-06 13:43:51 +08:00 |
|
|
caoyanyi
|
955b2f0d4c
|
* Modify clone url.
|
2022-07-06 13:25:28 +08:00 |
|
|
liumengyi
|
7c2eae9399
|
* Fix bug of task #59469.
|
2022-07-06 13:22:01 +08:00 |
|
|
sunjun
|
654ae6fe91
|
sprint_59471
|
2022-07-06 04:23:38 +00:00 |
|
|
sunjun
|
cc15cb883b
|
sprint_59471
|
2022-07-06 03:34:15 +00:00 |
|
|
lanzongjun
|
5f468b66a7
|
test
|
2022-07-06 11:28:47 +08:00 |
|
|
sunjun
|
720bc02308
|
sprint_59471
|
2022-07-06 03:23:53 +00:00 |
|