 xieqiyu
|
157c60bd64
|
* Code for task#59546. Update unlink story.
|
2022-07-07 10:04:24 +08:00 |
|
|
xieqiyu
|
75d4bc213c
|
* Code for task#59546. Update batch create story and change story.
|
2022-07-07 09:49:15 +08:00 |
|
|
王怡栋
|
779e95fde9
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59546. Update create story and copy bug.
See merge request easycorp/zentaopms!4391
|
2022-07-07 01:40:11 +00:00 |
|
|
wangyidong
|
ab72e9986c
|
Merge branch 'sprint212_leiyong_task_59528'
|
2022-07-07 09:38:40 +08:00 |
|
|
王怡栋
|
e7502f6641
|
Merge branch 'master' into 'sprint212_leiyong_task_59528'
# Conflicts:
# module/execution/css/create.css
|
2022-07-07 01:38:20 +00:00 |
|
|
王怡栋
|
2ca2192913
|
Merge branch 'fixbug_report' into 'master'
Fixbug report
See merge request easycorp/zentaopms!4393
|
2022-07-07 01:36:34 +00:00 |
|
|
刘刚
|
52da827d60
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.
See merge request easycorp/zentaopms!4394
|
2022-07-07 01:23:55 +00:00 |
|
|
daitingting
|
3bdeeea0f0
|
* Fix bug #24908.
|
2022-07-07 01:12:48 +00:00 |
|
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
|
sunjun
|
d9e6914e53
|
fixbug
|
2022-07-07 01:04:35 +00:00 |
|
|
孙广明
|
69fb98ef34
|
Merge branch 'sprint213_zg' into 'master'
* Adjust cfd style
See merge request easycorp/zentaopms!4388
|
2022-07-07 00:45:49 +00:00 |
|
|
sunjun
|
de58643be7
|
fixbug
|
2022-07-06 14:33:20 +00:00 |
|
|
zenggang
|
93da33e08d
|
* Adjust cfd style
|
2022-07-06 09:38:39 +00:00 |
|
|
王怡栋
|
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 |
|
|
孙广明
|
409a96c494
|
Merge branch 'sprint213_zg_24867' into 'master'
* Adjust cfd css
See merge request easycorp/zentaopms!4386
|
2022-07-06 09:05:57 +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 |
|
|
孙广明
|
b7f59caaf9
|
Merge branch 'sprint/211_liumengyi_24892' into 'master'
* Fix bug #24892.
See merge request easycorp/zentaopms!4384
|
2022-07-06 08:46:39 +00:00 |
|
|
daitingting
|
e06b64e997
|
* Add fetchModule to distinguish rawModule.
|
2022-07-06 08:42:21 +00:00 |
|
|
liumengyi
|
3fd52a833f
|
* Fix bug #24892.
|
2022-07-06 16:33:53 +08: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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
caoyanyi
|
f7bb57b869
|
* Remove unused code.
|
2022-07-06 14:25:28 +08:00 |
|