 孙广明
|
0784fd7489
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7026
|
2023-02-22 02:46:41 +00:00 |
|
|
tianshujie
|
deae64dcd1
|
* Add a prompt for the execution type.
|
2023-02-22 10:38:25 +08:00 |
|
|
tianshujie
|
9e7fe8f35d
|
* Code for finish task #85414.
|
2023-02-22 10:22:29 +08:00 |
|
|
tianshujie
|
1c1fd123da
|
* Code for finish task #85415.
|
2023-02-22 10:21:56 +08:00 |
|
|
孙广明
|
5779cee0d1
|
Merge branch 'sprint/292_liumengyi_85042' into 'master'
* Finish task #85042.
See merge request easycorp/zentaopms!7022
|
2023-02-22 02:19:34 +00:00 |
|
|
孙广明
|
d657bd4747
|
Merge branch 'lyk_fixbug' into 'master'
* Add the not passed parameter.
See merge request easycorp/zentaopms!7024
|
2023-02-22 02:01:13 +00:00 |
|
|
liumengyi
|
22f081736f
|
* Fix bug for task #85039.
|
2023-02-22 02:01:04 +00:00 |
|
|
liuyongkai
|
94d1f20de5
|
* Add the not passed parameter.
|
2023-02-22 09:56:16 +08:00 |
|
|
tianshujie
|
200e97d5b8
|
* Code for finish task #85414.
|
2023-02-22 09:55:00 +08:00 |
|
|
tianshujie
|
49e0ae82c6
|
* Code for finish task #85415.
|
2023-02-22 09:54:38 +08:00 |
|
|
liumengyi
|
ff7ff98bff
|
* Finish task #85042.
|
2023-02-22 01:44:23 +00:00 |
|
|
liumengyi
|
ae8e745acd
|
* Finish task #85042.
|
2023-02-22 01:42:50 +00:00 |
|
|
王怡栋
|
9565f88595
|
Merge branch 'tsj_fixbug' into 'master'
* Increment to the value of null time.
See merge request easycorp/zentaopms!7018
|
2023-02-22 01:37:58 +00:00 |
|
|
王怡栋
|
d37613d077
|
Merge branch 'sprint/hufangzhou_fixbug' into 'master'
* Recovery code.
See merge request easycorp/zentaopms!7021
|
2023-02-22 01:36:19 +00:00 |
|
|
hufangzhou
|
98a5efb31c
|
* Recovery code.
|
2023-02-22 01:34:50 +00:00 |
|
|
孙广明
|
ad43b64feb
|
Merge branch 'lyk_ticket_388' into 'master'
Lyk ticket 388
See merge request easycorp/zentaopms!7019
|
2023-02-22 00:26:36 +00:00 |
|
|
孙广明
|
311f4a7da6
|
Merge branch 'sprint/hufangzhou_task_85037' into 'master'
* Finish task #85037.
See merge request easycorp/zentaopms!7017
|
2023-02-22 00:20:38 +00:00 |
|
|
tianshujie
|
4f5e7ef2e8
|
* Increment to the value of null time.
|
2023-02-21 17:20:53 +08:00 |
|
|
hufangzhou
|
02b8e6f723
|
* Finish task #85037.
|
2023-02-21 08:46:43 +00:00 |
|
|
王怡栋
|
8c7788aa03
|
Merge branch 'dev/gfl_admin_refactors' into 'master'
Dev/gfl admin refactors
See merge request easycorp/zentaopms!7016
|
2023-02-21 08:42:47 +00:00 |
|
|
guofeilong
|
bdd52bcd1d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_admin_refactors
|
2023-02-21 16:36:15 +08:00 |
|
|
孙广明
|
3685a40ca7
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7015
|
2023-02-21 08:21:13 +00:00 |
|
|
tianshujie
|
8d2abc483d
|
* Fixed print navigation issues.
|
2023-02-21 16:14:27 +08:00 |
|
|
tianshujie
|
8bf7fa466c
|
* Fix error of authority group.
|
2023-02-21 16:05:38 +08:00 |
|
|
zhujinyong
|
6b241f1d06
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-21 15:56:50 +08:00 |
|
|
zhujinyong
|
39b2773e77
|
* Fix bug #32332.
|
2023-02-21 15:55:33 +08:00 |
|
|
孙广明
|
f3c2629d48
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug of sql.
See merge request easycorp/zentaopms!7014
|
2023-02-21 07:37:41 +00:00 |
|
|
liumengyi
|
ffedd1ac6d
|
* Fix bug of sql.
|
2023-02-21 07:36:49 +00:00 |
|
|
孙广明
|
7439b5a6a4
|
Merge branch 'sprint/hufangzhou_task_85051' into 'master'
* Fix bug for create execution.
See merge request easycorp/zentaopms!7013
|
2023-02-21 07:23:19 +00:00 |
|
|
孙广明
|
a789a412cb
|
更新module/execution/js/common.js
|
2023-02-21 07:23:03 +00:00 |
|
|
hufangzhou
|
10e9d3a6a8
|
* Fix bug for create execution.
|
2023-02-21 07:14:49 +00:00 |
|
|
guofeilong
|
f8987c102d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_admin_refactors
|
2023-02-21 15:02:46 +08:00 |
|
|
guofeilong
|
d3e27b3389
|
* Code for module admin refactors.
|
2023-02-21 14:00:48 +08:00 |
|
|
孙广明
|
e05d8b2eff
|
Merge branch 'sprint/hufangzhou_task_85050' into 'master'
* Finish task #85050.
See merge request easycorp/zentaopms!7012
|
2023-02-21 05:54:46 +00:00 |
|
|
hufangzhou
|
b997124e9c
|
* Finish task #85050.
|
2023-02-21 05:52:28 +00:00 |
|
|
孙广明
|
e91cb4b2b6
|
Merge branch 'sprint/hufangzhou_task_85051' into 'master'
* Finish task #85051.
See merge request easycorp/zentaopms!7011
|
2023-02-21 05:51:52 +00:00 |
|
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
|
孙广明
|
777b20ebdc
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7009
|
2023-02-21 05:47:26 +00:00 |
|
|
孙广明
|
0745b389af
|
Merge branch 'sprint/hufangzhou_85049' into 'master'
* Code for task #85049.
See merge request easycorp/zentaopms!7008
|
2023-02-21 05:38:06 +00:00 |
|
|
tianshujie
|
29e3eec34c
|
* Add case for custom module.
|
2023-02-21 13:36:28 +08:00 |
|
|
hufangzhou
|
dc40747000
|
* Finish task #85051.
|
2023-02-21 05:14:28 +00:00 |
|
|
tianshujie
|
517fb3c796
|
* Code for finish task #85046.
|
2023-02-21 13:13:13 +08:00 |
|
|
liuyongkai
|
d7e3cc4309
|
* Resolve feedback #388. and bug #32309.
|
2023-02-21 11:29:20 +08:00 |
|
|
liuyongkai
|
1aee4378fd
|
* Resolve feedback #388. and bug #32309.
|
2023-02-21 11:20:33 +08:00 |
|
|
liumengyi
|
a9f19a5a80
|
* Finish task #85040.
|
2023-02-21 02:58:05 +00:00 |
|
|
朱金勇
|
b775a45b3a
|
Merge branch 'php53' into 'master'
* Compatible PHP5.3.
See merge request easycorp/zentaopms!7007
|
2023-02-21 02:47:14 +00:00 |
|
|
liumengyi
|
3fc6835bea
|
* Fix bug of task #85038.
|
2023-02-21 02:44:47 +00:00 |
|
|
zhujinyong
|
6ae6909717
|
* Fix merge bug.
|
2023-02-21 10:28:55 +08:00 |
|
|
zhujinyong
|
5551177931
|
+ Add error of different type.
|
2023-02-21 10:24:00 +08:00 |
|
|
tianshujie
|
71151c93df
|
* Delete useless language items.
|
2023-02-21 10:16:35 +08:00 |
|