 王怡栋
|
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 |
|
|
lanzongjun
|
d6a387935f
|
* fix bug #24813
|
2022-07-06 14:44:36 +08:00 |
|
|
tianshujie
|
16a8bcf5f6
|
* Finish task #58557.
|
2022-07-06 14:40:42 +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 |
|
|
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
|
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 |
|
|
zhouxudong
|
bf19599c0e
|
* Finish task #59525.
|
2022-07-06 02:15:33 +00:00 |
|
|
xieqiyu
|
e1d315fe2c
|
* Code for task#59546. Modify createLane and deleteLane.
|
2022-07-06 10:07:37 +08:00 |
|
|
liumengyi
|
625d04ff6f
|
* Fix bug of task #59477.
|
2022-07-06 09:51:14 +08:00 |
|
|
王怡栋
|
c7b10921f4
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Finish task #59477.
See merge request easycorp/zentaopms!4364
|
2022-07-06 01:50:59 +00:00 |
|
|
liumengyi
|
45183de128
|
* Add annotation.
|
2022-07-06 09:49:20 +08:00 |
|
|
王怡栋
|
e97acef6d9
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24753,#24754.
See merge request easycorp/zentaopms!4361
|
2022-07-06 01:48:53 +00:00 |
|
|
王怡栋
|
4eb9fb5904
|
Merge branch 'master_xieqiyu_23949' into 'master'
* Fix bug#23949.
See merge request easycorp/zentaopms!4360
|
2022-07-06 01:48:28 +00:00 |
|
|
王怡栋
|
8c8fd29f34
|
Merge branch 'sprint/master_zhouxudong_59533' into 'master'
* Finish task #59533.
See merge request easycorp/zentaopms!4363
|
2022-07-06 01:44:41 +00:00 |
|
|
王怡栋
|
e3a045ac61
|
Merge branch 'sprint/master_zhouxudong_59748' into 'master'
Sprint/master zhouxudong 59748
See merge request easycorp/zentaopms!4366
|
2022-07-06 01:40:46 +00:00 |
|
|
zhouxudong
|
ae9ac7d0c8
|
* Finish task #59748.
|
2022-07-06 01:36:53 +00:00 |
|
|
zhouxudong
|
85f7dd9c95
|
* Finish task #59525.
|
2022-07-06 01:29:25 +00:00 |
|
|
liumengyi
|
500302a590
|
* Fix bug of task #59477.
|
2022-07-06 09:28:10 +08:00 |
|
|
孙广明
|
9a6689837b
|
* Add date to cfd.
|
2022-07-06 09:16:36 +08:00 |
|
|
孙广明
|
6fe5ef5a23
|
Merge branch 'sprint_59473' into 'master'
Sprint 59473
See merge request easycorp/zentaopms!4362
|
2022-07-06 01:13:32 +00:00 |
|
|
zhouxudong
|
7a9f685ecf
|
* Finish task #59533.
|
2022-07-06 01:13:31 +00:00 |
|
|
sunjun
|
e5ed8133b1
|
sprint_59473
|
2022-07-06 01:06:35 +00:00 |
|
|
liumengyi
|
4324454636
|
* Fix bug of task #59477.
|
2022-07-06 08:52:27 +08:00 |
|
|
孙广明
|
cbe74dd653
|
* Code for cfd details.
|
2022-07-06 08:44:57 +08:00 |
|