 tianshujie
|
6950f375d1
|
* Code for task #89907.
|
2023-04-04 16:18:51 +08:00 |
|
|
tianshujie
|
d5677a6690
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 15:45:41 +08:00 |
|
|
tianshujie
|
0d77839340
|
* Code for task #89915.
|
2023-04-04 15:45:25 +08:00 |
|
|
guofeilong
|
ec6221a2eb
|
* Adjust code .
|
2023-04-04 15:41:46 +08:00 |
|
|
王怡栋
|
3f8ff00846
|
Merge branch 'daitingting_task_#89953' into 'master'
* Finish task #89953.
See merge request easycorp/zentaopms!7307
|
2023-04-04 07:20:17 +00:00 |
|
|
王怡栋
|
712b3dd345
|
Merge branch 'tsj_authority' into 'master'
* Modify the document navigation and links.
See merge request easycorp/zentaopms!7311
|
2023-04-04 07:18:48 +00:00 |
|
|
王怡栋
|
ed28a97f54
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7312
|
2023-04-04 07:16:42 +00:00 |
|
|
tianshujie
|
e1eaf74466
|
* Add space.
|
2023-04-04 15:16:29 +08:00 |
|
|
guofeilong
|
4d9a87026e
|
* Adjust code .
|
2023-04-04 15:13:17 +08:00 |
|
|
tianshujie
|
93e6eb0b1e
|
* Code for task #89915.
|
2023-04-04 15:11:16 +08:00 |
|
|
guofeilong
|
a36b1f7606
|
* Adjust code .
|
2023-04-04 15:08:13 +08:00 |
|
|
tianshujie
|
f5d2c3a093
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_authority
|
2023-04-04 14:59:09 +08:00 |
|
|
tianshujie
|
f1c6a240f0
|
* Code for task #89915.
|
2023-04-04 14:58:07 +08:00 |
|
|
孙广明
|
68b851d650
|
Merge branch 'sprint/scx_arrow_svg' into 'master'
* Add arrow svg to bi.
See merge request easycorp/zentaopms!7309
|
2023-04-04 06:49:14 +00:00 |
|
|
宋辰轩
|
4c376874cf
|
* Add arrow svg to bi.
|
2023-04-04 14:45:11 +08:00 |
|
|
tianshujie
|
1bd3209351
|
* Code for task #89915.
|
2023-04-04 14:37:45 +08:00 |
|
|
王怡栋
|
fa746e5b0e
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7308
|
2023-04-04 06:37:18 +00:00 |
|
|
guofeilong
|
3d4798a32a
|
* Adjust code .
|
2023-04-04 14:29:59 +08:00 |
|
|
daitingting
|
b368f38d57
|
* Finish task #89953.
|
2023-04-04 13:53:25 +08:00 |
|
|
guofeilong
|
4a2fd21040
|
* Adjust code .
|
2023-04-04 13:27:12 +08:00 |
|
|
tianshujie
|
f5448921c6
|
* The search criteria are preserved when the list is sorted.
|
2023-04-04 13:26:59 +08:00 |
|
|
孙广明
|
db3c302f1d
|
Merge branch 'feedback_zhouxin_2257' into 'master'
* Resolve feedback 2257.
See merge request easycorp/zentaopms!7306
|
2023-04-04 05:26:13 +00:00 |
|
|
tianshujie
|
49666e311e
|
* Code for task #89927.
|
2023-04-04 13:24:18 +08:00 |
|
|
liugang
|
fcfa648c7e
|
* Fix bug the variable $screenID in browse page isn't the real id.
|
2023-04-04 05:24:07 +00:00 |
|
|
liugang
|
5282f9407f
|
* Sort sqls and fix bug 3 screens' status are draft.
|
2023-04-04 05:18:02 +00:00 |
|
|
guofeilong
|
b2000c4403
|
* Adjust code .
|
2023-04-04 13:10:24 +08:00 |
|
|
caoyanyi
|
16a94c471b
|
* Modify page style.
|
2023-04-04 13:07:53 +08:00 |
|
|
zhouxin
|
e3ca141890
|
* Resolve feedback 2257.
|
2023-04-04 12:35:35 +08:00 |
|
|
caoyanyi
|
ff5509e5d5
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 11:57:50 +08:00 |
|
|
caoyanyi
|
308c12095b
|
* Optimize page style.
|
2023-04-04 11:57:29 +08:00 |
|
|
wangyidong
|
b65f7996a8
|
* code for task #89905.
|
2023-04-04 11:29:59 +08:00 |
|
|
王怡栋
|
3824aecf9e
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7305
|
2023-04-04 03:23:33 +00:00 |
|
|
caoyanyi
|
bf4de54980
|
* Code for bug #33706.
|
2023-04-04 11:21:39 +08:00 |
|
|
wangyidong
|
5983e62864
|
* code for task #89905.
|
2023-04-04 11:16:39 +08:00 |
|
|
wangyidong
|
f6c0c0e14f
|
* code for task #89905.
|
2023-04-04 11:16:39 +08:00 |
|
|
王怡栋
|
cefeb5dbe2
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7304
|
2023-04-04 03:14:41 +00:00 |
|
|
tianshujie
|
a3e64446b4
|
* Fix jump link for execution document library.
|
2023-04-04 11:05:17 +08:00 |
|
|
liugang
|
56dc716e6e
|
+ Add privilege of annualData.
|
2023-04-04 02:57:45 +00:00 |
|
|
caoyanyi
|
9313f05b4a
|
* Code for task #89917.
|
2023-04-04 10:57:03 +08:00 |
|
|
caoyanyi
|
fae1a8a1b1
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 10:56:59 +08:00 |
|
|
guofeilong
|
c40a50987a
|
* Adjust code .
|
2023-04-04 10:54:34 +08:00 |
|
|
tianshujie
|
bcfd37f6e4
|
* Fix bug #33697.
|
2023-04-04 10:54:30 +08:00 |
|
|
tianshujie
|
52a40837df
|
* Fix bug #33617.
|
2023-04-04 10:33:46 +08:00 |
|
|
liugang
|
0d19218860
|
* Display the annualData by fetch.
|
2023-04-04 02:33:40 +00:00 |
|
|
王怡栋
|
6f82b846c4
|
Merge branch 'release/zentaopms_18.3' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7303
|
2023-04-04 02:25:02 +00:00 |
|
|
tianshujie
|
6d075a59c2
|
* Fix bug #33635.
|
2023-04-04 10:24:16 +08:00 |
|
|
王怡栋
|
0e02cf6cda
|
Merge branch 'daitingting_replace_grouppriv' into 'master'
* Replace screen grouppriv instead of update.
See merge request easycorp/zentaopms!7302
|
2023-04-04 02:18:17 +00:00 |
|
|
caoyanyi
|
e165bf1cfd
|
* Remove unused code.
|
2023-04-04 10:12:29 +08:00 |
|
|
tianshujie
|
0280b418b2
|
* Fix bug #33688.
|
2023-04-04 10:04:51 +08:00 |
|
|
tianshujie
|
8273eb56ff
|
* Fix bug #33635.
|
2023-04-04 09:58:50 +08:00 |
|