孙广明
|
bfdcc7b924
|
Merge branch 'sunhuawei_fixbug_22616' into 'master'
*Fix bug#22616.
See merge request easycorp/zentaopms!3479
|
2022-05-18 07:56:29 +00:00 |
|
liumengyi
|
be5daac0ba
|
* Fix bug #22628.
|
2022-05-18 15:23:12 +08:00 |
|
xieqiyu
|
b223f55900
|
* Code for task#54467.
|
2022-05-18 14:00:29 +08:00 |
|
孙华伟
|
b59fb9cc1c
|
*Fix bug#22616.
|
2022-05-18 13:43:48 +08:00 |
|
孙广明
|
cecff5ddec
|
Merge branch 'sprint/191_liumengyi_54336' into 'master'
Sprint/191 liumengyi 54336
See merge request easycorp/zentaopms!3474
|
2022-05-18 03:17:58 +00:00 |
|
liumengyi
|
e83da7c524
|
* Fix bug for task #54336.
|
2022-05-18 11:15:21 +08:00 |
|
wangyidong
|
e9289b68d5
|
* adjust for data.
|
2022-05-18 11:11:11 +08:00 |
|
liumengyi
|
aacfdcdc1c
|
* Fix bug for task #54336.
|
2022-05-18 11:10:57 +08:00 |
|
xieqiyu
|
5d73710741
|
* Finish task#54468.
|
2022-05-18 11:00:54 +08:00 |
|
王怡栋
|
ad6b686c0d
|
Merge branch 'master_xieqiyu_54467' into 'master'
* Finish task#54467.
See merge request easycorp/zentaopms!3466
|
2022-05-18 01:52:49 +00:00 |
|
xieqiyu
|
a68cf385bb
|
* Finish task#54467.
|
2022-05-18 09:45:11 +08:00 |
|
liumengyi
|
2f8e2e03e3
|
* Finish task #54336.
|
2022-05-18 08:54:40 +08:00 |
|
孙广明
|
33de37f468
|
Merge branch 'sprint/190_zg_54192' into 'master'
* Finish task#54192,54196
See merge request easycorp/zentaopms!3449
|
2022-05-17 08:53:21 +00:00 |
|
zenggang
|
56363dbfeb
|
* Adjust code
|
2022-05-17 08:52:33 +00:00 |
|
孙广明
|
268d3c3bcf
|
* Finish task #54218.
|
2022-05-17 16:04:39 +08:00 |
|
zenggang
|
8a06d71cfd
|
* Finish task#54192,54196
|
2022-05-17 07:46:52 +00:00 |
|
孙广明
|
270715e54b
|
Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631
See merge request easycorp/zentaopms!3410
|
2022-05-17 01:15:01 +00:00 |
|
sunjun
|
7e9466abbd
|
sprint_sunjun_631
|
2022-05-16 21:08:04 +08:00 |
|
王怡栋
|
cd2b17e27b
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of burn when have no data in burn datatable.
See merge request easycorp/zentaopms!3417
|
2022-05-16 05:06:14 +00:00 |
|
王怡栋
|
2cdf81eda4
|
Merge branch 'sprint/master_zhouxudong_22441' into 'master'
Sprint/master zhouxudong 22441
See merge request easycorp/zentaopms!3411
|
2022-05-16 05:05:37 +00:00 |
|
xieqiyu
|
ae00461660
|
* Fix bug of burn when have no data in burn datatable.
|
2022-05-16 11:50:54 +08:00 |
|
zhouxudong
|
53102c368e
|
* Fix bug #22441.
|
2022-05-16 03:28:40 +00:00 |
|
xieqiyu
|
e1942b98b2
|
* Show execution deadline at burn in view page.
|
2022-05-16 11:13:11 +08:00 |
|
sunjun
|
073ee90d40
|
sprint_sunjun_631
|
2022-05-16 11:10:20 +08:00 |
|
zhouxudong
|
a5783fa37c
|
* Fix bug #22441.
|
2022-05-16 01:55:08 +00:00 |
|
zhouxudong
|
d1d05a067e
|
* Fix bug #22441.
|
2022-05-16 01:38:43 +00:00 |
|
sunjun
|
d26e9a0c94
|
sprint_sunjun_631
|
2022-05-16 09:13:55 +08:00 |
|
sunjun
|
249190e049
|
sprint_sunjun_631
|
2022-05-16 09:11:50 +08:00 |
|
sunjun
|
a4f026d786
|
sprint_sunjun_631
|
2022-05-16 09:08:47 +08:00 |
|
xieqiyu
|
8c50568213
|
* Restore the code of task#53671.
|
2022-05-15 21:28:31 +08:00 |
|
sunjun
|
f5fe24b54f
|
sprint_sunjun_631
|
2022-05-15 12:47:45 +08:00 |
|
sunjun
|
4863551658
|
sprint_sunjun_631
|
2022-05-14 21:06:48 +08:00 |
|
sunjun
|
9ad4d27dc4
|
sprint_sunjun_631
|
2022-05-14 20:32:54 +08:00 |
|
sunjun
|
e9aab00257
|
sprint_sunjun_631
|
2022-05-14 19:39:22 +08:00 |
|
sunjun
|
730561654f
|
sprint_sunjun_631
|
2022-05-13 05:41:39 +00:00 |
|
xieqiyu
|
7e2ee4fcdd
|
* Fix bug#22487.
|
2022-05-13 11:56:46 +08:00 |
|
xieqiyu
|
bd8fb230d1
|
* Fix bug#22409.
|
2022-05-13 11:55:05 +08:00 |
|
sunjun
|
845c84a1eb
|
*sprint_sunjun_631
|
2022-05-13 02:53:47 +00:00 |
|
xieqiyu
|
89491d97de
|
* Resolve issue#629.
|
2022-05-13 03:02:26 +08:00 |
|
xieqiyu
|
fa4ea0ff4d
|
* Fix bug#22409.
|
2022-05-13 00:09:10 +08:00 |
|
xieqiyu
|
f5210e857b
|
* Code for task#53666.
|
2022-05-12 23:27:00 +08:00 |
|
xieqiyu
|
914f474592
|
* Code for task#53666.
|
2022-05-12 22:58:17 +08:00 |
|
王怡栋
|
a9d13faa1a
|
Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
# module/execution/js/edit.js
|
2022-05-12 05:20:13 +00:00 |
|
zhouxudong
|
4bd2710b91
|
* Finish task #53651.
|
2022-05-12 05:15:13 +00:00 |
|
王怡栋
|
5674160b7e
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3353
|
2022-05-12 05:05:25 +00:00 |
|
zhouxudong
|
13e965e484
|
* Finish task #53651.
|
2022-05-12 05:02:51 +00:00 |
|
zhouxudong
|
f98d82234a
|
* Finish task #53651.
|
2022-05-12 03:57:23 +00:00 |
|
zhouxudong
|
65fff67e58
|
* finish task #53651.
|
2022-05-12 00:30:00 +00:00 |
|
xieqiyu
|
e7d559a90b
|
* Fix bug for task#53666.
|
2022-05-12 01:13:42 +08:00 |
|
xieqiyu
|
612a2b656e
|
* Adjust code style.
|
2022-05-12 00:18:05 +08:00 |
|