admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
lx-admin-backend/ruoyi-ui/src
History
疯狂的狮子li 31a2713012 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
2020-04-03 10:16:28 +08:00
..
api
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-04-03 10:16:28 +08:00
assets
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-04-03 10:16:28 +08:00
components
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-03-19 09:10:03 +08:00
directive/permission
初始化项目
2020-02-13 10:48:51 +08:00
layout
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-04-03 10:16:28 +08:00
router
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-03-19 09:10:03 +08:00
store
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-03-19 09:10:03 +08:00
utils
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-04-03 10:16:28 +08:00
views
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-04-03 10:16:28 +08:00
App.vue
初始化项目
2020-02-13 10:48:51 +08:00
main.js
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
2020-02-24 09:56:22 +08:00
permission.js
初始化项目
2020-02-13 10:48:51 +08:00
settings.js
初始化项目
2020-02-13 10:48:51 +08:00