Commit 0df8cb20 authored by Dyml's avatar Dyml

Merge branch 'GJYZJ_V1.0' of http://gitlab.archser.com/common/aserver

# Conflicts: # src/main/resources/DBUpdate/DM_UpdateSQL.xml
parents 61bfa242 aa60dc37
...@@ -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));
} }
/** /**
* 获取菜单列表 * 获取菜单列表
*/ */
......
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment