Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
aserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
15所TongWeb
aserver
Commits
0df8cb20
Commit
0df8cb20
authored
Jul 07, 2020
by
Dyml
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GJYZJ_V1.0' of
http://gitlab.archser.com/common/aserver
# Conflicts: # src/main/resources/DBUpdate/DM_UpdateSQL.xml
parents
61bfa242
aa60dc37
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
MenuController.java
...n/java/com/archser/aserver/controller/MenuController.java
+3
-1
DM_UpdateSQL.xml
src/main/resources/DBUpdate/DM_UpdateSQL.xml
+6
-0
No files found.
src/main/java/com/archser/aserver/controller/MenuController.java
View file @
0df8cb20
...
@@ -30,7 +30,7 @@ public class MenuController extends Controller {
...
@@ -30,7 +30,7 @@ public class MenuController extends Controller {
private
MenuService
menuService
;
private
MenuService
menuService
;
/**
/**
* 获取权限菜单
获取权限菜单
*/
*/
public
void
index
()
{
public
void
index
()
{
String
username
=
this
.
getAttrForStr
(
"username"
);
String
username
=
this
.
getAttrForStr
(
"username"
);
...
@@ -58,6 +58,8 @@ public class MenuController extends Controller {
...
@@ -58,6 +58,8 @@ public class MenuController extends Controller {
this
.
renderJson
(
Ret
.
ok
(
"apps"
,
systems
));
this
.
renderJson
(
Ret
.
ok
(
"apps"
,
systems
));
}
}
/**
/**
* 获取菜单列表
* 获取菜单列表
*/
*/
...
...
src/main/resources/DBUpdate/DM_UpdateSQL.xml
View file @
0df8cb20
...
@@ -764,4 +764,9 @@
...
@@ -764,4 +764,9 @@
alter table AS_CHECK_RECORD_RESULT add(DATASIGN1 VARCHAR2(200));
alter table AS_CHECK_RECORD_RESULT add(DATASIGN1 VARCHAR2(200));
</sql>
</sql>
</version>
</version>
<version
edition=
"43"
description=
"档案分类排序"
>
<sql
creator=
"xiaoying"
createDate=
"20200703"
note=
"档案分类排序"
>
alter table AS_TREECLASSFIC add(SERIALINDEX VARCHAR2(500));
</sql>
</version>
</update>
</update>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment