 孙广明
|
c2ea44f0c7
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
* Fixed positioning issues of guide block.
See merge request easycorp/zentaopms!6606
|
2022-12-21 02:45:41 +00:00 |
|
|
田淑杰
|
7aff4d599e
|
* Fixed positioning issues of guide block.
|
2022-12-21 10:17:32 +08:00 |
|
|
caoyanyi
|
cb51799c85
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-21 09:11:19 +08:00 |
|
|
caoyanyi
|
00a774e19e
|
* Modify page reload.
|
2022-12-21 09:11:06 +08:00 |
|
|
田淑杰
|
4eeaf48a5a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-21 08:56:35 +08:00 |
|
|
caoyanyi
|
1192ea3680
|
* Modify page position.
|
2022-12-20 21:01:56 +08:00 |
|
|
孙广明
|
dd6992d4bc
|
Merge branch 'zhouxin_feedback_172' into 'master'
* Resolve feedback #172.
See merge request easycorp/zentaopms!6604
|
2022-12-20 07:43:46 +00:00 |
|
|
zhouxin
|
d741dfd154
|
* Resolve feedback #172.
|
2022-12-20 07:29:13 +00:00 |
|
|
孙广明
|
b4112578bf
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
Sprint/272 tsj
See merge request easycorp/zentaopms!6603
|
2022-12-20 07:09:56 +00:00 |
|
|
田淑杰
|
00a8e6317a
|
* Refactor.
|
2022-12-20 14:53:46 +08:00 |
|
|
田淑杰
|
cbd8fa5706
|
* Refactor.
|
2022-12-20 14:06:30 +08:00 |
|
|
wangyidong
|
ac9e876101
|
* code task #80452.
|
2022-12-20 13:53:37 +08:00 |
|
|
田淑杰
|
eaa184f3bc
|
* Finish task #79626.
|
2022-12-20 13:51:33 +08:00 |
|
|
田淑杰
|
ef53759baf
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_tsj
|
2022-12-20 13:41:56 +08:00 |
|
|
wangyidong
|
58efe7b011
|
* code task #80458,80463.
|
2022-12-20 11:31:15 +08:00 |
|
|
田淑杰
|
86a21acfb0
|
* Finish task #79627.
|
2022-12-20 11:29:13 +08:00 |
|
|
王怡栋
|
93c174c0a3
|
Merge branch 'sprint/272_wzm_fixhref' into 'sprint/272'
* fix href
See merge request easycorp/zentaopms!6602
|
2022-12-20 03:12:49 +00:00 |
|
|
wangzemei
|
ba69b3285d
|
* fix href
|
2022-12-20 11:08:57 +08:00 |
|
|
caoyanyi
|
7e3b50d9f0
|
* Add priv check.
|
2022-12-20 11:02:40 +08:00 |
|
|
王怡栋
|
72cc0cc0aa
|
Merge branch 'sprint/272_wzm_79625' into 'sprint/272'
* finish task 79625
See merge request easycorp/zentaopms!6600
|
2022-12-20 02:52:50 +00:00 |
|
|
wangzemei
|
3495f621bf
|
* Delete space
|
2022-12-20 10:49:06 +08:00 |
|
|
王怡栋
|
ffe0b359e9
|
Merge branch 'sprint/feedback1752' into 'master'
Sprint/feedback1752
See merge request easycorp/zentaopms!6599
|
2022-12-20 02:43:23 +00:00 |
|
|
王怡栋
|
2d7d58ed29
|
Merge branch 'sprint/cyy_79631' into 'sprint/272'
* Code for task #79631.
See merge request easycorp/zentaopms!6598
|
2022-12-20 02:43:00 +00:00 |
|
|
wangzemei
|
7719edcc82
|
Merge br* code format
|
2022-12-20 10:42:26 +08:00 |
|
|
wangzemei
|
d8f1380aa4
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_wzm_79625
|
2022-12-20 10:22:03 +08:00 |
|
|
caoyanyi
|
17a61a108f
|
* Modify font size.
|
2022-12-20 10:21:23 +08:00 |
|
|
chaideqing
|
b670a052de
|
* Fix feedback1752.
|
2022-12-20 10:10:33 +08:00 |
|
|
wangzemei
|
1868b3155d
|
* finish task 79625
|
2022-12-20 09:59:43 +08:00 |
|
|
caoyanyi
|
3a396e0a9c
|
* Code for task #79631.
|
2022-12-20 09:38:31 +08:00 |
|
|
田淑杰
|
c5925821b0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-20 09:37:03 +08:00 |
|
|
wangzemei
|
6b8c4daf06
|
* add modal
|
2022-12-20 09:33:25 +08:00 |
|
|
caoyanyi
|
7859132611
|
* Modify font color.
|
2022-12-20 09:26:42 +08:00 |
|
|
wangyidong
|
d28ea77f0d
|
* code for task #80461.
|
2022-12-20 09:24:07 +08:00 |
|
|
wangyidong
|
c093724f9d
|
* fix bug #80463.
|
2022-12-20 09:24:06 +08:00 |
|
|
caoyanyi
|
29a884e9d7
|
* Modify font size.
|
2022-12-20 09:17:46 +08:00 |
|
|
caoyanyi
|
ae05ef1601
|
* Modify page error.
|
2022-12-20 09:01:28 +08:00 |
|
|
王怡栋
|
5650dd779a
|
Merge branch 'sprint/cyy_79631' into 'sprint/272'
* Code for task #79631.
See merge request easycorp/zentaopms!6597
|
2022-12-20 00:16:09 +00:00 |
|
|
王怡栋
|
6b4135e66f
|
Merge branch 'bug_30798' into 'master'
* Fix bug#30798
See merge request easycorp/zentaopms!6595
|
2022-12-20 00:15:29 +00:00 |
|
|
wangzemei
|
93ece5bb70
|
* ztask 79625
|
2022-12-20 08:04:27 +08:00 |
|
|
caoyanyi
|
1014829f3b
|
* Code for task #79631.
|
2022-12-19 17:01:54 +08:00 |
|
|
朱金勇
|
4fc76fe596
|
Merge branch 'fix_execution_view' into 'master'
* Fix search style error in execution view page.
See merge request easycorp/zentaopms!6596
|
2022-12-19 08:39:18 +00:00 |
|
|
Lufei
|
c3244b958f
|
* Fix search style error in execution view page.
|
2022-12-19 16:36:14 +08:00 |
|
|
zenggang
|
14dc7079d1
|
* Fix bug#30798
|
2022-12-19 08:17:56 +00:00 |
|
|
孙广明
|
927cf0762d
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
Sprint/272 tsj
See merge request easycorp/zentaopms!6594
|
2022-12-19 07:43:12 +00:00 |
|
|
田淑杰
|
e441c004b0
|
* Fix bug #31010.
|
2022-12-19 14:56:42 +08:00 |
|
|
田淑杰
|
c08ab35765
|
* Finish task #79624.
|
2022-12-19 14:51:56 +08:00 |
|
|
田淑杰
|
0bce13f996
|
* Compatible lite page.
|
2022-12-19 13:13:28 +08:00 |
|
|
孙广明
|
137ba608bd
|
Merge branch 'sprint/hufangzhou_xuantag' into 'master'
* Adjust the xuan tag.
See merge request easycorp/zentaopms!6592
zentaopms_18.0.beta2
|
2022-12-19 03:22:34 +00:00 |
|
|
孙广明
|
9b9763c45c
|
Merge branch 'sprint/272_tianshujie' into 'sprint/272'
* Add update function of task #79622.
See merge request easycorp/zentaopms!6593
|
2022-12-19 03:22:28 +00:00 |
|
|
孙广明
|
309903e055
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30943
See merge request easycorp/zentaopms!6591
|
2022-12-19 03:18:52 +00:00 |
|