Commit 1c83f7a4ced905cfc448054174dad471d8f97fcb
Exists in
master
编辑冲突信息
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 62 changed files
- center.manager/src/main/java/com/lyms/cm/controller/sys/SysPermissionsController.java
- center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolePermissionMapsController.java
- center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
- center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.java
- center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.xml
- center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.java
- center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.xml
- center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java
- center.manager/src/main/java/com/lyms/cm/entity/sys/SysPermissions.java
- center.manager/src/main/java/com/lyms/cm/entity/sys/SysRolePermissionMaps.java
- center.manager/src/main/java/com/lyms/cm/service/sys/SysPermissionsService.java
- center.manager/src/main/java/com/lyms/cm/service/sys/SysRolePermissionMapsService.java
- center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java
- center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysPermissionsServiceImpl.java
- center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolePermissionMapsServiceImpl.java
- center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java
- center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java
- center.manager/src/main/webapp/WEB-INF/static/js/base/common.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/.gitignore
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/awesomeStyle/awesome.css
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/awesomeStyle/awesome.less
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/awesomeStyle/fa.less
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/awesomeStyle/img/loading.gif
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/demo.css
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/metroStyle/img/line_conn.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/metroStyle/img/loading.gif
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/metroStyle/img/metro.gif
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/metroStyle/img/metro.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/metroStyle/metroStyle.css
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/1_close.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/1_open.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/2.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/3.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/4.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/5.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/6.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/7.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/8.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/diy/9.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/line_conn.gif
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/loading.gif
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/zTreeStandard.gif
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/img/zTreeStandard.png
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/css/zTreeStyle/zTreeStyle.css
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery-1.4.4.min.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.all-3.5.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.all-3.5.min.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.core-3.5.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.core-3.5.min.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.excheck-3.5.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.excheck-3.5.min.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.exedit-3.5.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.exedit-3.5.min.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.exedit.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.exhide-3.5.js
- center.manager/src/main/webapp/WEB-INF/static/js/zTree_v3/js/jquery.ztree.exhide-3.5.min.js
- center.manager/src/main/webapp/WEB-INF/views/common/base_list.html
- center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
- center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
- center.manager/src/main/webapp/WEB-INF/views/role/tree_test.html
- design-doc/doc/code/eclipse/codetemplates.xml
- design-doc/doc/code/eclipse/lyms-formatter.xml