9 Commits

Author	SHA1	Message	Date
疯狂的狮子li	af25588b88	Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # pom.xml # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java # ruoyi-generator/pom.xml # ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java # ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java # ruoyi-generator/src/main/resources/vm/js/api.js.vm # ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm # ruoyi-generator/src/main/resources/vm/vue/index.vue.vm # ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm # ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java # ruoyi-ui/package.json # ruoyi-ui/src/api/monitor/server.js # ruoyi-ui/src/components/RuoYi/Doc/index.vue # ruoyi-ui/src/components/RuoYi/Git/index.vue # ruoyi-ui/src/components/SizeSelect/index.vue # ruoyi-ui/src/layout/components/Sidebar/Logo.vue # ruoyi-ui/src/layout/components/TagsView/index.vue # ruoyi-ui/src/layout/index.vue # ruoyi-ui/src/main.js # ruoyi-ui/src/plugins/download.js # ruoyi-ui/src/router/index.js # ruoyi-ui/src/store/modules/permission.js # ruoyi-ui/src/store/modules/settings.js # ruoyi-ui/src/store/modules/tagsView.js # ruoyi-ui/src/store/modules/user.js # ruoyi-ui/src/views/login.vue # ruoyi-ui/src/views/monitor/job/log.vue # ruoyi-ui/src/views/system/dict/data.vue # ruoyi-ui/src/views/system/role/index.vue # ruoyi-ui/src/views/system/user/authRole.vue # ruoyi-ui/src/views/system/user/index.vue # ruoyi-ui/src/views/system/user/profile/resetPwd.vue # ruoyi-ui/src/views/system/user/profile/userAvatar.vue # ruoyi-ui/src/views/system/user/profile/userInfo.vue	2021-11-25 19:39:53 +08:00
RuoYi	026a427103	优化前端代码	2021-11-24 14:47:24 +08:00
疯狂的狮子li	48817519a9	update 修改页面文档与源码地址	2021-07-26 13:08:54 +08:00
疯狂的狮子li	4bee0d652a	修复前端页面报错 找不到模块问题	2020-04-25 20:09:39 +08:00
疯狂的狮子li	6687efd887	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/package.json ruoyi-ui/src/components/RuoYi/Git/index.vue ruoyi-ui/src/layout/components/Navbar.vue ruoyi-ui/src/main.js ruoyi-ui/src/utils/index.js ruoyi-ui/src/utils/permission.js ruoyi-ui/src/utils/ruoyi.js ruoyi-ui/src/views/system/dept/index.vue ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/tool/build/index.vue ruoyi-ui/src/views/tool/gen/genInfoForm.vue ruoyi/pom.xml ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java ruoyi/src/main/resources/application.yml ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml ruoyi/src/main/resources/vm/java/controller.java.vm ruoyi/src/main/resources/vm/java/domain.java.vm ruoyi/src/main/resources/vm/vue/index.vue.vm	2020-02-24 09:56:22 +08:00
RuoYi	cb0a4b78ee	若依 2.1	2020-02-24 09:28:16 +08:00
疯狂的狮子li	2841620be6	初始化项目	2020-02-13 10:48:51 +08:00
疯狂的狮子li	abdb1048ed	删除文件 ruoyi-ui	2020-02-13 10:47:14 +08:00
RuoYi	46444bd0fe	RuoYi-Vue 1.0	2019-10-08 09:14:38 +08:00