李玉春
|
bf512c437b
|
Merge branch 'sprint/191_liumengyi_54336' into 'master'
* Finish task #54346,#54345.
See merge request easycorp/zentaopms!3436
|
2022-05-17 02:25:55 +00:00 |
|
liumengyi
|
566b87823f
|
* Finish task #54346,#54345.
|
2022-05-17 10:07:26 +08:00 |
|
王怡栋
|
a8afd69c54
|
Merge branch 'sgm_sprint190' into 'master'
* Code for task #54189.
See merge request easycorp/zentaopms!3433
|
2022-05-17 01:19:16 +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 |
|
孙广明
|
397930ac4e
|
* Code for task #54189.
|
2022-05-17 08:56:07 +08:00 |
|
sunjun
|
7e9466abbd
|
sprint_sunjun_631
|
2022-05-16 21:08:04 +08:00 |
|
王怡栋
|
f565477c52
|
Merge branch 'master_xieqiyu_22496' into 'master'
* Fix bug#22496.
See merge request easycorp/zentaopms!3429
|
2022-05-16 09:27:22 +00:00 |
|
王怡栋
|
3cd2d727a7
|
Merge branch 'sprint/master_zhouxudong_22531' into 'master'
* Fix bug #22531.
See merge request easycorp/zentaopms!3431
|
2022-05-16 09:26:34 +00:00 |
|
zhouxudong
|
48c052efad
|
* Fix bug #22531.
|
2022-05-16 09:23:29 +00:00 |
|
孙广明
|
57e139b2a4
|
Merge branch 'sprint/scx_testcase' into 'master'
Sprint/scx testcase
See merge request easycorp/zentaopms!3295
|
2022-05-16 09:04:32 +00:00 |
|
xieqiyu
|
c01b9f54cf
|
* Fix bug#22496.
|
2022-05-16 16:40:25 +08:00 |
|
xieqiyu
|
5ee54fb81a
|
* Fix bug#22496.
|
2022-05-16 16:30:24 +08:00 |
|
孙华伟
|
3ae610d77d
|
Update model.php
|
2022-05-16 08:27:21 +00:00 |
|
孙华伟
|
94af8b93af
|
*Optimize the code.
|
2022-05-16 16:26:19 +08:00 |
|
孙华伟
|
ecea8c6147
|
Update model.php
|
2022-05-16 08:24:40 +00:00 |
|
孙华伟
|
4c968d5872
|
*Optimize the code.
|
2022-05-16 16:21:34 +08:00 |
|
孙华伟
|
39c0ad9c17
|
*Finish task #54207.
|
2022-05-16 16:08:30 +08:00 |
|
王怡栋
|
568d74299e
|
Merge branch 'master_xieqiyu_22375' into 'master'
* Fix bug#22375.
See merge request easycorp/zentaopms!3426
|
2022-05-16 07:13:36 +00:00 |
|
xieqiyu
|
e085535743
|
* Fix bug#22375.
|
2022-05-16 14:59:06 +08:00 |
|
王怡栋
|
57cf623f54
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3423
|
2022-05-16 06:45:50 +00:00 |
|
tanghucheng
|
a0bd326f3b
|
* Fix bug.
|
2022-05-16 06:43:34 +00:00 |
|
孙广明
|
175c38ef9d
|
Merge branch 'bug_22471' into 'master'
* Fix bug#22471
See merge request easycorp/zentaopms!3413
|
2022-05-16 06:14:40 +00:00 |
|
李玉春
|
8d8a321ed6
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22490.
See merge request easycorp/zentaopms!3422
|
2022-05-16 06:14:07 +00:00 |
|
王怡栋
|
77308c7fc1
|
Merge branch 'sprint/189_hufangzhou_sso' into 'master'
* Fix an error of sso.
See merge request easycorp/zentaopms!3419
|
2022-05-16 05:57:59 +00:00 |
|
王怡栋
|
0d87358352
|
Merge branch 'sprint/189_hufangzhou_22250' into 'master'
* Fix bug #22250.
See merge request easycorp/zentaopms!3420
|
2022-05-16 05:57:41 +00:00 |
|
zhouxudong
|
9e4d86d6d8
|
* FIx bug #22523.
|
2022-05-16 05:54:54 +00:00 |
|
zhouxudong
|
89a150e856
|
* Fix bug #22523.
|
2022-05-16 05:48:54 +00:00 |
|
hufangzhou
|
7cc75bf80a
|
* Fix bug #22250.
|
2022-05-16 13:43:36 +08:00 |
|
tianshujie
|
f328086daf
|
* Fix bug #22490.
|
2022-05-16 13:43:08 +08:00 |
|
hufangzhou
|
03556828a6
|
* Fix an error of sso.
|
2022-05-16 13:11:08 +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 |
|
王怡栋
|
80c36bb26f
|
Merge branch 'sprint/master_zhouxudong_22514' into 'master'
* Fix bug #22514.
See merge request easycorp/zentaopms!3418
|
2022-05-16 05:03:42 +00:00 |
|
zhouxudong
|
ec0f0b4a95
|
* Fix bug #22514.
|
2022-05-16 04:01:58 +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 |
|
hufangzhou
|
3f060b57fe
|
* Delete the unused file.
|
2022-05-16 11:27:00 +08: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 |
|
zenggang
|
ef4c0d9849
|
* Fix bug#22471
|
2022-05-16 02:46:27 +00:00 |
|
王怡栋
|
19d32ad6ec
|
Merge branch 'sprint/189_hufangzhou_deletefiles' into 'master'
* Delete the files during upgrade.
See merge request easycorp/zentaopms!3392
|
2022-05-16 02:12:01 +00:00 |
|
hufangzhou
|
8baa5938de
|
* Retain necessary files.
|
2022-05-16 10:10:56 +08:00 |
|
hufangzhou
|
091c3e1ca4
|
* Add the comment.
|
2022-05-16 10:03:15 +08:00 |
|
hufangzhou
|
28d4ca7ff4
|
* Add the score auto test case.
|
2022-05-16 09:56:18 +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 |
|
tianshujie
|
bc694cb2f4
|
* Delete extra blank lines.
|
2022-05-16 09:24:58 +08:00 |
|
sunjun
|
d26e9a0c94
|
sprint_sunjun_631
|
2022-05-16 09:13:55 +08:00 |
|
tianshujie
|
aaea60f6ad
|
* Fix bug #22489.
|
2022-05-16 09:13:18 +08:00 |
|
sunjun
|
249190e049
|
sprint_sunjun_631
|
2022-05-16 09:11:50 +08:00 |
|