 王怡栋
|
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 |
|
|
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 |
|
|
xieqiyu
|
8c50568213
|
* Restore the code of task#53671.
|
2022-05-15 21:28:31 +08: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 |
|
|
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 |
|
|
xieqiyu
|
dab8c1bb1e
|
* Modify review code.
|
2022-05-12 10:55:50 +08:00 |
|
|
xieqiyu
|
ffa1ec828d
|
* Code for task#53661.
|
2022-05-12 10:38:22 +08:00 |
|
|
xieqiyu
|
1cab87893e
|
* Finish task#53661.
|
2022-05-12 09:19:49 +08:00 |
|
|
xieqiyu
|
691de86d4a
|
* Code for task#53661.
|
2022-05-12 08:15:25 +08:00 |
|
|
xieqiyu
|
ce7c0afdc1
|
* Finish task#53666.
|
2022-05-11 18:24:13 +08:00 |
|
|
王怡栋
|
fe9eb1bf83
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug
See merge request easycorp/zentaopms!3340
|
2022-05-11 09:09:04 +00:00 |
|
|
王怡栋
|
b8533b242c
|
Merge branch 'sprint/master_zhouxudong_22337' into 'master'
* Fix bug #22337.
See merge request easycorp/zentaopms!3329
|
2022-05-11 09:08:33 +00:00 |
|
|
zhouxudong
|
a0f2b068dc
|
* Fix bug #22339.
|
2022-05-11 08:51:36 +00:00 |
|
|
zhouxudong
|
675d2c2e86
|
* Fix bug #22339.
|
2022-05-11 08:49:22 +00:00 |
|
|
wangyuting2
|
3380222afc
|
* Fix build action menu bug.
|
2022-05-11 16:11:34 +08:00 |
|
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08:00 |
|
|
zhouxudong
|
02476229d9
|
* Fix bug #22337.
|
2022-05-11 06:59:17 +00:00 |
|
|
zhouxudong
|
f498199820
|
* Fix bug #22337.
|
2022-05-11 06:55:32 +00:00 |
|
|
zhouxudong
|
87b8baa7b3
|
* Fix bug #22337.
|
2022-05-11 06:46:39 +00:00 |
|
|
孙广明
|
622185aa65
|
Merge branch 'sprint/189_zhouxudong_53651' into 'master'
Sprint/189 zhouxudong 53651
See merge request easycorp/zentaopms!3323
|
2022-05-11 05:51:12 +00:00 |
|
|
zhouxudong
|
c0886b850d
|
* Finish task #53651.
|
2022-05-11 05:49:21 +00:00 |
|
|
zhouxudong
|
ca827e1d6c
|
* Finish task #53651.
|
2022-05-11 05:32:48 +00:00 |
|
|
王怡栋
|
82968630b0
|
Merge branch 'master_xieqiyu_53671' into 'master'
Master xieqiyu 53671
See merge request easycorp/zentaopms!3322
|
2022-05-11 05:17:05 +00:00 |
|
|
zhouxudong
|
cec71ebfd8
|
* Finish task #53651.
|
2022-05-11 04:10:30 +00:00 |
|
|
xieqiyu
|
5c23f91a05
|
* Code for task#53671.
|
2022-05-11 11:29:03 +08:00 |
|
|
zhouxudong
|
da5cd2aa44
|
* Finish task #53651.
|
2022-05-11 03:02:28 +00:00 |
|
|
xieqiyu
|
f821b92e7f
|
* Modify review code.
|
2022-05-11 10:44:00 +08:00 |
|
|
xieqiyu
|
c77a6505d3
|
* Finish task#53671.
|
2022-05-11 09:01:17 +08:00 |
|
|
zhouxudong
|
1723a78c92
|
* Finish task #53651.
|
2022-05-10 09:11:06 +00:00 |
|
|
孙广明
|
e6ba9acf68
|
Merge branch 'sprint/tianshujie_task53668' into 'master'
Sprint/tianshujie task53668
See merge request easycorp/zentaopms!3310
|
2022-05-10 09:09:34 +00:00 |
|
|
tianshujie
|
5bdb7f521c
|
* Finish task #53668.
|
2022-05-10 17:05:49 +08:00 |
|
|
孙广明
|
9d8f4b4f21
|
Merge branch 'task_sunjun_53665' into 'master'
sprint_sunjun_53665
See merge request easycorp/zentaopms!3306
|
2022-05-10 08:23:21 +00:00 |
|
|
sunjun
|
631601a39b
|
sprint_sunjun_53665
|
2022-05-10 06:42:34 +00:00 |
|