 xieqiyu
|
a44ba79b1d
|
* Fix bug#25027.
|
2022-07-14 13:35:17 +08:00 |
|
|
王怡栋
|
196ee9ff18
|
Merge branch 'master_xieqiyu_25094' into 'master'
* Fix bug#25094.
See merge request easycorp/zentaopms!4530
|
2022-07-14 05:03:50 +00:00 |
|
|
zenggang
|
fd9b0b1053
|
* Fix bug#25241
|
2022-07-14 02:20:00 +00:00 |
|
|
xieqiyu
|
bbab93d08d
|
* Fix bug#25094.
|
2022-07-14 09:59:06 +08:00 |
|
|
孙广明
|
6a4d372473
|
Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232
See merge request easycorp/zentaopms!4527
|
2022-07-14 01:46:53 +00:00 |
|
|
孙广明
|
d41303c7e2
|
Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic
See merge request easycorp/zentaopms!4515
|
2022-07-14 01:44:53 +00:00 |
|
|
zenggang
|
38e996bd18
|
* Fix bug#25222,25232
|
2022-07-14 01:38:00 +00:00 |
|
|
zhouxudong
|
ce70c10870
|
* Code optimization.
|
2022-07-13 09:20:34 +00:00 |
|
|
sunjun
|
d5c9657af2
|
fixbug
|
2022-07-13 06:16:14 +00:00 |
|
|
王怡栋
|
30e7879a41
|
Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!4493
|
2022-07-13 03:12:44 +00:00 |
|
|
王怡栋
|
65e48dadb8
|
Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.
See merge request easycorp/zentaopms!4487
|
2022-07-13 02:02:44 +00:00 |
|
|
liumengyi
|
be11f49b45
|
* Optimize code.
|
2022-07-13 09:46:02 +08:00 |
|
|
zhouxudong
|
adaa8667d7
|
* Finish task #60393.
|
2022-07-12 09:30:15 +00:00 |
|
|
王怡栋
|
11f2eb8a0f
|
Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476
See merge request easycorp/zentaopms!4485
|
2022-07-12 09:20:31 +00:00 |
|
|
王怡栋
|
8bbc43b99c
|
Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.
See merge request easycorp/zentaopms!4468
|
2022-07-12 07:23:46 +00:00 |
|
|
mayue
|
0a5cf0a831
|
* Optimize code.
|
2022-07-12 14:28:17 +08:00 |
|
|
mayue
|
a21626979e
|
* Fix bug #25081.
|
2022-07-12 14:25:58 +08:00 |
|
|
liumengyi
|
154c18ee43
|
* Finish task #60476.
|
2022-07-12 11:07:16 +08:00 |
|
|
zhouxudong
|
951d41d721
|
* Finish task #60393.
|
2022-07-12 02:54:06 +00:00 |
|
|
zenggang
|
5d116c16c9
|
* Finish task#60640
|
2022-07-12 02:29:20 +00:00 |
|
|
孙广明
|
107060744e
|
Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.
See merge request easycorp/zentaopms!4463
|
2022-07-12 00:54:34 +00:00 |
|
|
mayue
|
9248adc1af
|
* Finish task #60639.
|
2022-07-11 18:10:09 +08:00 |
|
|
王怡栋
|
4c3d59333a
|
Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.
See merge request easycorp/zentaopms!4450
|
2022-07-11 07:56:19 +00:00 |
|
|
mayue
|
ea0500a20c
|
* Finish task #60641.
|
2022-07-11 15:26:14 +08:00 |
|
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
|
mayue
|
5bedd02491
|
* Fix bug #25031.
|
2022-07-11 09:54:58 +08:00 |
|
|
liumengyi
|
9921474711
|
* Fix bug #23123.
|
2022-07-08 13:43:43 +08:00 |
|
|
liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|
|
zenggang
|
b8c23acb69
|
* Adjust code
|
2022-07-08 01:42:17 +00:00 |
|
|
zenggang
|
a01d530a0a
|
* Hide cfd stat
|
2022-07-08 01:38:33 +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 |
|
|
孙广明
|
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 |
|
|
tianshujie
|
ce191b4f9e
|
* Fix bug #24945.
|
2022-07-08 09:04:57 +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 |
|
|
孙广明
|
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 |
|
|
王怡栋
|
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
|
3049879a44
|
* Fix bug of task #59482.
|
2022-07-07 09:40:07 +08:00 |
|
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
|
liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +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
|
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 |
|