caoyanyi
|
fcd76f31ce
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 10:39:36 +08:00 |
|
caoyanyi
|
7d976a5f1c
|
* Modify order for menu.
|
2023-04-06 10:38:44 +08:00 |
|
wangyidong
|
a5421e4940
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 10:30:52 +08:00 |
|
wangyidong
|
56791f12ef
|
* code for task #89916.
|
2023-04-06 10:29:23 +08:00 |
|
tianshujie
|
47780015f8
|
* Fixed the bottom paging style problem。
|
2023-04-06 10:27:21 +08:00 |
|
caoyanyi
|
c89efa5632
|
* Add version for api lib.
|
2023-04-06 09:31:31 +08:00 |
|
guofeilong
|
9484c73fba
|
* Adjust code .
|
2023-04-06 09:28:51 +08:00 |
|
tianshujie
|
f3897e5dc8
|
* Fixed an error message when clicking level 1.5 and then clicking Level
2.5.
|
2023-04-06 09:23:32 +08:00 |
|
tianshujie
|
75d07972ab
|
* Code for task #89915.
|
2023-04-06 09:14:00 +08:00 |
|
tianshujie
|
ce25a89da4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 09:01:44 +08:00 |
|
tianshujie
|
e6591f64d8
|
* Fix bug #33759.
|
2023-04-06 08:57:42 +08:00 |
|
王怡栋
|
2e98282d5a
|
Merge branch 'daitingting_task_#89956' into 'master'
* Finish task #89956.
See merge request easycorp/zentaopms!7315
|
2023-04-06 00:55:24 +00:00 |
|
王怡栋
|
79bc2f4d1f
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7314
|
2023-04-06 00:55:08 +00:00 |
|
王怡栋
|
e1933a9b50
|
Merge branch 'daitingting_task_#89954' into 'master'
* Finish task #89954.
See merge request easycorp/zentaopms!7313
|
2023-04-06 00:54:46 +00:00 |
|
王怡栋
|
eb1c1e2ee2
|
Merge branch 'tsj_docTree' into 'master'
* Code for task #89915.
See merge request easycorp/zentaopms!7316
|
2023-04-06 00:52:45 +00:00 |
|
tianshujie
|
b2d4be08f5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 08:28:04 +08:00 |
|
liugang
|
2525123024
|
* Remove the BIZ text, fix bug #33760.
|
2023-04-06 00:11:21 +00:00 |
|
朱金勇
|
4cf70fdf7e
|
* Fix insert method of dao.
|
2023-04-05 15:58:43 +00:00 |
|
朱金勇
|
22f9f1d087
|
Merge branch 'db'
|
2023-04-05 14:30:11 +00:00 |
|
朱金勇
|
7f9d638d28
|
* Fix sql for dmdb.
|
2023-04-05 14:18:24 +00:00 |
|
tianshujie
|
c5d2bc5c17
|
* Code for task #89915.
|
2023-04-05 17:02:03 +08:00 |
|
tianshujie
|
1e77c10378
|
* Code for task #89915.
|
2023-04-05 15:54:25 +08:00 |
|
tianshujie
|
1a3ce097fd
|
* Code for task #89906.
|
2023-04-05 13:58:53 +08:00 |
|
朱金勇
|
0f6b78f264
|
Fix strict mode of MySQL.
|
2023-04-05 02:11:12 +00:00 |
|
tianshujie
|
e90d2c0d66
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 20:52:39 +08:00 |
|
tianshujie
|
6682974d6d
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 17:30:04 +08:00 |
|
tianshujie
|
b87a68b349
|
* Code for task #89906.
|
2023-04-04 17:29:13 +08:00 |
|
caoyanyi
|
eeeb68e41e
|
* Add data app attr.
|
2023-04-04 17:23:45 +08:00 |
|
daitingting
|
47629c2f79
|
* Finish task #89956.
|
2023-04-04 17:09:29 +08:00 |
|
caoyanyi
|
43c80f5268
|
* Modify tree style.
|
2023-04-04 16:58:29 +08:00 |
|
caoyanyi
|
081cec516e
|
* Modify page style.
|
2023-04-04 16:44:22 +08:00 |
|
caoyanyi
|
8084793317
|
* Modify api doc view.
|
2023-04-04 16:43:10 +08:00 |
|
caoyanyi
|
2b552d4fca
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 16:24:03 +08:00 |
|
caoyanyi
|
6bf6d020e6
|
* Add pager for release.
|
2023-04-04 16:23:34 +08:00 |
|
daitingting
|
6c331dc642
|
* Finish task #89954.
|
2023-04-04 16:19:43 +08:00 |
|
tianshujie
|
6950f375d1
|
* Code for task #89907.
|
2023-04-04 16:18:51 +08:00 |
|
liugang
|
9339533b7a
|
* Display the main navagator if user has permission to access any menu under it.
|
2023-04-04 08:13:08 +00:00 |
|
liugang
|
4a1be481d9
|
* Format code.
|
2023-04-04 07:53:03 +00: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 |
|
王怡栋
|
9e05683f67
|
Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Do task #90109.
See merge request easycorp/zentaopms!7310
|
2023-04-04 07:21:03 +00: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 |
|