 王怡栋
|
4363ce8031
|
Merge branch 'ticket_398' into 'master'
* Adjust code for feedback #2274.
See merge request easycorp/zentaopms!7034
|
2023-02-22 08:14:40 +00:00 |
|
|
孙广明
|
25fa088422
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7033
|
2023-02-22 07:55:34 +00:00 |
|
|
孙广明
|
10d679aee1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-22 15:53:02 +08:00 |
|
|
王怡栋
|
73ac71d948
|
Merge branch 'sprint/tsj_issue' into 'master'
Sprint/tsj issue
See merge request easycorp/zentaopms!7031
|
2023-02-22 07:52:35 +00:00 |
|
|
孙广明
|
1e39b37278
|
* Add unit test.
|
2023-02-22 15:52:27 +08:00 |
|
|
王怡栋
|
8b53329ebb
|
Merge branch 'cyy_optimize' into 'master'
* Code for issue #762.
See merge request easycorp/zentaopms!7030
|
2023-02-22 07:51:35 +00:00 |
|
|
王怡栋
|
c2c7469dde
|
Merge branch 'dev/gfl_admin_view_refactors' into 'master'
* admin: view refactors.
See merge request easycorp/zentaopms!7032
|
2023-02-22 07:50:33 +00:00 |
|
|
liumengyi
|
5ed6406041
|
* Fix issue #754, #751, and adjust width of create project guide.
|
2023-02-22 07:50:21 +00:00 |
|
|
liumengyi
|
740afc7a0c
|
* Fix bug.
|
2023-02-22 07:48:23 +00:00 |
|
|
guofeilong
|
746860335b
|
* admin: view refactors.
|
2023-02-22 15:39:38 +08:00 |
|
|
tianshujie
|
2668c3040e
|
* Refactor.
|
2023-02-22 15:36:15 +08:00 |
|
|
tianshujie
|
d753f6ebb6
|
* Resolve issue #761.
|
2023-02-22 15:31:45 +08:00 |
|
|
tianshujie
|
b126b69130
|
* Resolve issue #756.
|
2023-02-22 15:19:07 +08:00 |
|
|
caoyanyi
|
7c257b5e1e
|
* Code for issue #762.
|
2023-02-22 15:16:48 +08:00 |
|
|
tianshujie
|
af76befb02
|
* Resolve issue #756.
|
2023-02-22 15:15:34 +08:00 |
|
|
朱金勇
|
91f1b64c2c
|
Merge branch 'cache' into 'master'
+ Support Apcu and Yac cache driver.
See merge request easycorp/zentaopms!7028
|
2023-02-22 06:20:02 +00:00 |
|
|
鲁飞
|
c93d138a83
|
+ Support Apcu and Yac cache driver.
|
2023-02-22 06:20:00 +00:00 |
|
|
王怡栋
|
faf214c602
|
Merge branch 'lyk_bug_32376' into 'master'
* Fix bug #32376.
See merge request easycorp/zentaopms!7029
|
2023-02-22 05:29:49 +00:00 |
|
|
liuyongkai
|
769e0d2913
|
* Fix bug #32376.
|
2023-02-22 13:20:44 +08:00 |
|
|
zhujinyong
|
e9ef9029b6
|
* Code for task #84594.
|
2023-02-22 11:39:36 +08:00 |
|
|
Yagami
|
e52777039f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-22 11:23:08 +08:00 |
|
|
Yagami
|
fe93b22b68
|
* Code for program browse icon.
|
2023-02-22 11:22:29 +08:00 |
|
|
王怡栋
|
9ca6097dc6
|
Merge branch 'tsj_fixbug' into 'master'
* Code for finish task #85046.
See merge request easycorp/zentaopms!7027
|
2023-02-22 03:16:05 +00:00 |
|
|
tianshujie
|
650e440acc
|
* Code for finish task #85046.
|
2023-02-22 11:11:14 +08:00 |
|
|
王怡栋
|
d40df85905
|
Merge branch 'bugfix/konglignmao-f2188' into 'master'
* Resove feedback f2188, change privilege by modulue error.
See merge request easycorp/zentaopms!7025
|
2023-02-22 02:54:21 +00:00 |
|
|
王怡栋
|
1303aabfdc
|
Merge branch 'bugfix/myWorkApi' into 'master'
+ Resolved feedback #2016, the api my work task response error.
See merge request easycorp/zentaopms!6778
|
2023-02-22 02:53:14 +00:00 |
|
|
孙广明
|
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 |
|
|
孔令茂
|
3e7b0daf91
|
* Resove feedback f2188, change privilege by modulue error.
|
2023-02-22 10:08:22 +08: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 |
|
|
liuhong
|
f5056eb802
|
* Adjust code for feedback #2274.
|
2023-02-21 09:50:19 +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 |
|