 liyuchun
|
cbe4562f1d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-25 08:57:14 +08:00 |
|
|
liyuchun
|
a9b8582cc9
|
* Add cron task.
|
2022-08-25 08:57:01 +08:00 |
|
|
孙广明
|
2cd85595a1
|
Merge branch 'sprint/231_liumengyi_26841' into 'master'
* Fix bug #26841.
See merge request easycorp/zentaopms!5101
|
2022-08-25 00:56:29 +00:00 |
|
|
liyuchun
|
b2189bf529
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-25 08:55:31 +08:00 |
|
|
liyuchun
|
0f1d8abfdf
|
* Add filed in zt_job.
|
2022-08-25 08:55:18 +08:00 |
|
|
wangyidong
|
9fda3e2610
|
Merge branch 'sprint/231_zg_65782'
|
2022-08-25 08:52:15 +08:00 |
|
|
王怡栋
|
297a416762
|
Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
# module/story/control.php
|
2022-08-25 00:51:00 +00:00 |
|
|
王怡栋
|
589934c524
|
Merge branch 'sprint/231_zg_65806' into 'master'
* Finish task#65806
See merge request easycorp/zentaopms!5077
|
2022-08-25 00:47:26 +00:00 |
|
|
王怡栋
|
638be2116b
|
Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5065
|
2022-08-25 00:46:17 +00:00 |
|
|
王怡栋
|
6c83e2b3fd
|
Merge branch 'master_xieqiyu_fixStoryBug' into 'master'
Master xieqiyu fix story bug
See merge request easycorp/zentaopms!5098
|
2022-08-25 00:45:49 +00:00 |
|
|
王怡栋
|
ecddbde00c
|
Merge branch 'sprint/ZUI_guofeilong_Picker' into 'master'
Sprint/zui guofeilong picker: update options disableEmptySearch
See merge request easycorp/zentaopms!5097
|
2022-08-25 00:43:10 +00:00 |
|
|
liumengyi
|
de58e793b4
|
* Fix bug #26841.
|
2022-08-25 08:39:47 +08:00 |
|
|
王怡栋
|
ada42d0453
|
Merge branch 'max43_tanghucheng' into 'master'
* Fix bug #26617.
See merge request easycorp/zentaopms!5086
|
2022-08-25 00:28:23 +00:00 |
|
|
李玉春
|
c84bcd5726
|
Merge branch 'cyy_api' into 'master'
* Modify error.
See merge request easycorp/zentaopms!5100
|
2022-08-25 00:10:25 +00:00 |
|
|
xieqiyu
|
14ce3c97f9
|
* Fix bug#26804,26797.
|
2022-08-24 22:43:27 +08:00 |
|
|
xieqiyu
|
b2becfb0ec
|
* Fix bug#26806.
|
2022-08-24 21:06:12 +08:00 |
|
|
xieqiyu
|
c863d5869c
|
* Fix bug#26802.
|
2022-08-24 19:03:52 +08:00 |
|
|
xieqiyu
|
3796dd0e47
|
* Fix bug#26785.
|
2022-08-24 18:48:19 +08:00 |
|
|
xieqiyu
|
3ce0a2946a
|
* Fix bug#26777.
|
2022-08-24 18:32:43 +08:00 |
|
|
xieqiyu
|
3df376cabb
|
* Fix bug#26777.
|
2022-08-24 18:31:17 +08:00 |
|
|
xieqiyu
|
dca623d429
|
* Fix bug#26780.
|
2022-08-24 17:40:34 +08:00 |
|
|
孙广明
|
7eb65e9c2e
|
Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug #26845.
See merge request easycorp/zentaopms!5096
|
2022-08-24 09:23:47 +00:00 |
|
|
caoyanyi
|
ff5bc6ffae
|
* Modify error.
|
2022-08-24 17:21:52 +08:00 |
|
|
liumengyi
|
c033a87009
|
* Fix bug #26845.
|
2022-08-24 17:19:59 +08:00 |
|
|
孙广明
|
f2e530f71c
|
Merge branch 'sprint/231_tianshujie_bug' into 'master'
* Fix bug for task #64967.
See merge request easycorp/zentaopms!5095
|
2022-08-24 09:14:44 +00:00 |
|
|
guofeilong
|
6e79a1c3d2
|
* picker: update logic in option disableEmptySearch
|
2022-08-24 09:08:11 +00:00 |
|
|
tianshujie
|
ce8a347d07
|
* Fix bug for task #64967.
|
2022-08-24 17:06:27 +08:00 |
|
|
tanghucheng
|
bbd1c4ea5e
|
* Fix bug #26617.
|
2022-08-24 17:05:46 +08:00 |
|
|
孙广明
|
f77d19f2c8
|
Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug #26838, #26839.
See merge request easycorp/zentaopms!5093
|
2022-08-24 08:31:52 +00:00 |
|
|
liumengyi
|
151ba86838
|
* Fix bug #26838.
|
2022-08-24 16:26:31 +08:00 |
|
|
liumengyi
|
e7bbfe300c
|
* Fix bug #26839.
|
2022-08-24 16:26:06 +08:00 |
|
|
xieqiyu
|
5ab68b8aa2
|
* Fix bug#26823.
|
2022-08-24 15:58:30 +08:00 |
|
|
xieqiyu
|
7ad6759625
|
* Fix bug#26770.
|
2022-08-24 15:53:51 +08:00 |
|
|
孙广明
|
01c6c2fa7a
|
Merge branch 'sprint/max43_mayue_task#65893' into 'master'
* Finish task #65893.
See merge request easycorp/zentaopms!5089
|
2022-08-24 07:29:34 +00:00 |
|
|
mayue
|
f637523c8f
|
* Optimize code.
|
2022-08-24 15:28:41 +08:00 |
|
|
胡方舟
|
60c557a802
|
Merge branch 'sprint/231_liumengyi_bug' into 'master'
* Code for unit test of bug.
See merge request easycorp/zentaopms!5090
|
2022-08-24 07:12:20 +00:00 |
|
|
胡方舟
|
2f2fc272e6
|
Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case
See merge request easycorp/zentaopms!5091
|
2022-08-24 07:11:24 +00:00 |
|
|
tianshujie
|
067abe91c3
|
* * Fix failed test cases for execution module.
|
2022-08-24 15:06:09 +08:00 |
|
|
tianshujie
|
99e3ef7a18
|
* Fix failed test cases for execution module.
|
2022-08-24 14:59:54 +08:00 |
|
|
liumengyi
|
8d8062122e
|
* Code for unit test of bug.
|
2022-08-24 14:56:51 +08:00 |
|
|
mayue
|
b64081a30e
|
* Finish task #65893.
|
2022-08-24 14:56:00 +08:00 |
|
|
tianshujie
|
e30d4256f8
|
* Fix failed test cases for execution module.
|
2022-08-24 14:54:15 +08:00 |
|
|
xieqiyu
|
1254de5f3e
|
* Fix bug#26769.
|
2022-08-24 14:50:53 +08:00 |
|
|
xieqiyu
|
6f18dfa4cc
|
* Fix bug#26764.
|
2022-08-24 14:22:58 +08:00 |
|
|
xieqiyu
|
a2c1dd7247
|
* Fix bug#26812.
|
2022-08-24 14:11:26 +08:00 |
|
|
xieqiyu
|
6b9885067d
|
* Fix bug#26776.
|
2022-08-24 13:59:49 +08:00 |
|
|
王怡栋
|
00b8ffc6f7
|
Merge branch 'sprint/unittest_liumengyi_bug' into 'master'
* Unit test of bug.
See merge request easycorp/zentaopms!4993
|
2022-08-24 05:47:55 +00:00 |
|
|
王怡栋
|
f097c7b756
|
Merge branch 'sprint/hufangzhou_executionunittest' into 'master'
* Modify the create and edit unit test case of execution module.
See merge request easycorp/zentaopms!5085
|
2022-08-24 05:41:33 +00:00 |
|
|
王怡栋
|
c2ac2b1f5a
|
Merge branch 'sprint/231_liumengyi_26768' into 'master'
* Fix bug #26768.
See merge request easycorp/zentaopms!5082
|
2022-08-24 05:34:42 +00:00 |
|
|
hufangzhou
|
243f2f468a
|
* Modify the create and edit unit test case of execution module.
|
2022-08-24 11:30:59 +08:00 |
|