xieqiyu
|
ae00461660
|
* Fix bug of burn when have no data in burn datatable.
|
2022-05-16 11:50:54 +08:00 |
|
xieqiyu
|
8c50568213
|
* Restore the code of task#53671.
|
2022-05-15 21:28:31 +08:00 |
|
xieqiyu
|
bd8fb230d1
|
* Fix bug#22409.
|
2022-05-13 11:55:05 +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
|
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
|
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 |
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08: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 |
|
xieqiyu
|
5c23f91a05
|
* Code for task#53671.
|
2022-05-11 11:29:03 +08: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 |
|
wangyidong
|
c9bc2ba86f
|
* code for task #53592.
|
2022-05-10 13:48:37 +08:00 |
|
daitingting
|
a71cf1d280
|
Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow
|
2022-05-10 01:44:47 +00:00 |
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
wangyuting2
|
a607161591
|
* Finish task #53549.
|
2022-05-09 17:00:41 +08:00 |
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
xieqiyu
|
88fbdad2fd
|
* Fix bug#22114.
|
2022-04-29 11:29:40 +08:00 |
|
sunjun
|
c2d9f7b240
|
*Fixbug_sunjun_22007
|
2022-04-28 02:48:11 +00:00 |
|
sunjun
|
0495a32a20
|
*Fixbug_sunjun_22007
|
2022-04-27 07:59:37 +00:00 |
|
xieqiyu
|
8f849cc8c3
|
* Fix bug#21640.
|
2022-04-19 16:06:27 +08:00 |
|
xieqiyu
|
e7314a8343
|
* Fix bug#19625.
|
2022-04-12 15:27:51 +08:00 |
|
tianshujie
|
0530b892e4
|
* Fix bug #18710.
|
2022-04-06 15:22:15 +08:00 |
|
孙广明
|
30645ffbff
|
Merge branch 'master_xieqiyu_21334' into 'master'
* Fix bug#21334.
See merge request easycorp/zentaopms!2729
|
2022-04-02 08:10:36 +00:00 |
|
王怡栋
|
c18710567b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-02 14:44:44 +08:00 |
|
王怡栋
|
6edb5fe805
|
* fix bug #21413.
|
2022-04-02 14:44:18 +08:00 |
|
xieqiyu
|
c0a9bad1a6
|
* Fix bug#21334.
|
2022-04-02 11:25:18 +08:00 |
|
孙广明
|
3e8175b22e
|
Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.
See merge request easycorp/zentaopms!2711
|
2022-04-02 02:18:37 +00:00 |
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
tianshujie
|
7407aabc00
|
* Fix bug #19104.
|
2022-04-01 14:32:00 +08:00 |
|
xieqiyu
|
c5eb774fdd
|
* Fix bug#21385.
|
2022-04-01 14:24:05 +08:00 |
|
zenggang
|
d63710351c
|
* Fix bug#11161
|
2022-04-01 02:06:20 +00:00 |
|
孙广明
|
5cc345e666
|
Merge branch 'master_xieqiyu_19665' into 'master'
* Fix bug#19665.
See merge request easycorp/zentaopms!2676
|
2022-03-31 09:42:04 +00:00 |
|
xieqiyu
|
2a57f4fd28
|
* Fix bug#19665.
|
2022-03-31 16:08:33 +08:00 |
|
tianshujie
|
deeced3e14
|
* Fix bug #21307.
|
2022-03-31 16:04:41 +08:00 |
|
tianshujie
|
b1bb3b7400
|
* Fix bug #21300.
|
2022-03-31 15:15:24 +08:00 |
|