 mayue
|
7ff031bc5f
|
* Finish task #59710.
|
2022-07-08 11:13:30 +08:00 |
|
|
孙广明
|
118e1f7854
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4420
|
2022-07-08 01:20:53 +00:00 |
|
|
孙广明
|
8ce405dec0
|
Merge branch 'sprint/213_mayue_bug#24848#24817' into 'master'
* Fix bug #24848#24817.
See merge request easycorp/zentaopms!4423
|
2022-07-08 01:20:09 +00:00 |
|
|
mayue
|
1df55e32a7
|
* Fix bug #24848#24817.
|
2022-07-08 09:18:53 +08:00 |
|
|
孙广明
|
6b33905ac8
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4422
|
2022-07-08 01:10:03 +00:00 |
|
|
mayue
|
f6d94ad4cb
|
* Fix bug #24848#24817.
|
2022-07-08 09:06:39 +08:00 |
|
|
孙广明
|
fc08eb2060
|
Merge branch 'fixbug_24248' into 'master'
fixbug_24248
See merge request easycorp/zentaopms!4413
|
2022-07-08 01:05:19 +00:00 |
|
|
孙广明
|
f6ed1804b3
|
Merge branch 'sprint213_zg_24761' into 'master'
* Fix bug#24761，Adjuct cfd stat
See merge request easycorp/zentaopms!4414
|
2022-07-08 01:05:07 +00:00 |
|
|
tianshujie
|
ce191b4f9e
|
* Fix bug #24945.
|
2022-07-08 09:04:57 +08:00 |
|
|
xieqiyu
|
29efcab628
|
* Code for task#59543.
|
2022-07-07 17:42:30 +08:00 |
|
|
xieqiyu
|
07231be2d2
|
* Code for task#59543.
|
2022-07-07 17:23:09 +08:00 |
|
|
zenggang
|
24b36766fb
|
* Adjuct cfd stat
|
2022-07-07 09:14:30 +00:00 |
|
|
王怡栋
|
9ef8354d1d
|
Merge branch 'sprint/211_tianshujie_fixbug' into 'master'
* Fix bug #24946.
See merge request easycorp/zentaopms!4416
|
2022-07-07 08:51:25 +00:00 |
|
|
tianshujie
|
105304ce57
|
* Fix bug #24946.
|
2022-07-07 16:18:22 +08:00 |
|
|
liumengyi
|
ef6ffd019b
|
* Fix bug of task #59480, #59481.
|
2022-07-07 15:46:36 +08:00 |
|
|
liumengyi
|
ecdd330102
|
* Fix bug of task #59480,#59481.
|
2022-07-07 14:41:10 +08:00 |
|
|
liumengyi
|
e709c4bbda
|
* Finish task #59480, #59481.
|
2022-07-07 14:12:45 +08:00 |
|
|
王怡栋
|
5dd799ee9e
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24942, #24949.
See merge request easycorp/zentaopms!4400
|
2022-07-07 05:10:46 +00:00 |
|
|
王怡栋
|
10b95d1e48
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4398
|
2022-07-07 05:10:07 +00:00 |
|
|
孙广明
|
d02553620f
|
Merge branch 'srpint213_zg_24853' into 'master'
* Fix bug#24853
See merge request easycorp/zentaopms!4396
|
2022-07-07 02:54:25 +00:00 |
|
|
mayue
|
8192f8b185
|
* Fix bug #24811.
|
2022-07-07 10:52:45 +08:00 |
|
|
liumengyi
|
119175e5c9
|
* Fix bug #24942.
|
2022-07-07 10:28:57 +08:00 |
|
|
xieqiyu
|
157c60bd64
|
* Code for task#59546. Update unlink story.
|
2022-07-07 10:04:24 +08:00 |
|
|
王怡栋
|
5879801b8b
|
Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.
See merge request easycorp/zentaopms!4395
|
2022-07-07 01:49:35 +00:00 |
|
|
zenggang
|
270ab7ce6e
|
* Fix bug#24853
|
2022-07-07 01:47:23 +00:00 |
|
|
liumengyi
|
59bbb4577a
|
* Finish task #59482.
|
2022-07-07 09:44:33 +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 |
|
|
liumengyi
|
3049879a44
|
* Fix bug of task #59482.
|
2022-07-07 09:40:07 +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 |
|
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
|
zenggang
|
93da33e08d
|
* Adjust cfd style
|
2022-07-06 09:38:39 +00:00 |
|
|
zenggang
|
4825e51b78
|
* Adjust cfd css
|
2022-07-06 09:04:56 +00:00 |
|
|
liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +08:00 |
|
|
mayue
|
fbb92627b8
|
* Fix bug #24832.
|
2022-07-06 15:51:28 +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 |
|
|
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
|
b1d6a4a93d
|
* Adjust code
|
2022-07-06 06:44:54 +00:00 |
|
|
zenggang
|
8773257051
|
* Finish task#59703,59711
|
2022-07-06 06:42:19 +00:00 |
|
|
孙广明
|
84876b851d
|
* Fix cfd line style.
|
2022-07-06 14:05:52 +08: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 |
|
|
孙广明
|
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 |
|
|
sunjun
|
e5ed8133b1
|
sprint_59473
|
2022-07-06 01:06:35 +00:00 |
|
|
孙广明
|
cbe74dd653
|
* Code for cfd details.
|
2022-07-06 08:44:57 +08:00 |
|
|
sunjun
|
d34e8f8638
|
sprint_59473
|
2022-07-06 00:29:14 +00:00 |
|
|
sunjun
|
84e078c1b2
|
sprint_59473
|
2022-07-05 14:35:33 +00:00 |
|
|
孙广明
|
781259ee6f
|
* Code for CFD.
|
2022-07-05 21:11:03 +08:00 |
|
|
孙广明
|
1166775664
|
Merge branch 'sgm_kanban' into 'master'
* Code for cfd.
See merge request easycorp/zentaopms!4355
|
2022-07-05 08:53:26 +00:00 |
|
|
孙广明
|
9ed8604daf
|
* Code for cfd.
|
2022-07-05 16:52:47 +08:00 |
|