 liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +08:00 |
|
|
孙广明
|
ada3b47db7
|
Merge branch 'sprint/213_mayue_bug#24832' into 'master'
* Fix bug #24832.
See merge request easycorp/zentaopms!4382
|
2022-07-06 07:56:09 +00:00 |
|
|
mayue
|
fbb92627b8
|
* Fix bug #24832.
|
2022-07-06 15:51:28 +08:00 |
|
|
王怡栋
|
01e9f98e06
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24785
See merge request easycorp/zentaopms!4381
|
2022-07-06 07:42:09 +00:00 |
|
|
lanzongjun
|
d664bc44b0
|
* fix bug #24785
|
2022-07-06 15:39:33 +08:00 |
|
|
孙广明
|
67f1f7d8c9
|
Merge branch 'sprint213_zg'
|
2022-07-06 15:02:53 +08: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 |
|
|
李玉春
|
cf979d3bbb
|
Merge branch 'sprint/wangzemei/task59575' into 'master'
* Code for task#59575
See merge request easycorp/zentaopms!4377
|
2022-07-06 06:49:49 +00:00 |
|
|
wangyidong
|
f0163f105f
|
Merge branch 'sprint/211_tianshujie_58557'
|
2022-07-06 14:47:48 +08: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 |
|
|
wangzemei
|
0085cbd22c
|
* Code for task#59575
|
2022-07-06 06:25:37 +00: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 |
|
|
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 |
|
|
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 |
|
|
liumengyi
|
ead37d6de6
|
* Fix bug #24843.
|
2022-07-06 13:43:51 +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 |
|
|
lanzongjun
|
a7410f7986
|
* fix bug #24806-2
|
2022-07-06 11:23:31 +08:00 |
|
|
lanzongjun
|
42e8032269
|
* fix bug #24806-2
|
2022-07-06 11:20:32 +08:00 |
|
|
lanzongjun
|
f63542faf3
|
* fix bug #24806
|
2022-07-06 11:18:06 +08:00 |
|
|
lanzongjun
|
305ea3d502
|
* fix bug #24806
|
2022-07-06 11:17:12 +08:00 |
|
|
lanzongjun
|
4fd0e3bcfe
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-07-06 11:16:01 +08:00 |
|
|
liumengyi
|
957d6f3249
|
* Fix bug of task #59469.
|
2022-07-06 11:11:45 +08:00 |
|
|
lanzongjun
|
fbc4db545c
|
* fix bug #24806
|
2022-07-06 11:07:39 +08:00 |
|
|
刘刚
|
d3174ab36c
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4368
|
2022-07-06 03:07:19 +00:00 |
|
|
daitingting
|
dddeaa9edd
|
* Finish task #59649.
|
2022-07-06 02:55:08 +00:00 |
|
|
xieqiyu
|
2536d83a98
|
* Modify code style.
|
2022-07-06 10:41:03 +08:00 |
|
|
xieqiyu
|
ef78ff16a5
|
* Modify set WIP in task kanban.
|
2022-07-06 10:38:53 +08:00 |
|
|
王怡栋
|
cea57edc73
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Fix bug of task #59477.
See merge request easycorp/zentaopms!4367
|
2022-07-06 02:17:51 +00:00 |
|
|
王怡栋
|
29bed0101b
|
Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525
See merge request easycorp/zentaopms!4365
|
2022-07-06 02:17:24 +00:00 |
|