疯狂的狮子li
|
42008124b6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-ui/src/assets/styles/ruoyi.scss
# ruoyi-ui/src/views/tool/gen/index.vue
|
6 years ago |
|
疯狂的狮子li
|
1dae7c9bc9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
|
疯狂的狮子li
|
1062da678f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
RuoYi
|
526c3867b4
|
代码生成Date字段添加默认格式
|
6 years ago |
|
RuoYi
|
bb1340ecc6
|
操作日志详细显示类型
|
6 years ago |
|
疯狂的狮子li
|
0ba48df61e
|
升级 v2.1
|
6 years ago |
|
疯狂的狮子li
|
db20b4a3d3
|
升级 v2.1
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
cb0a4b78ee
|
若依 2.1
|
6 years ago |
|
疯狂的狮子li
|
7c8d062d58
|
修改 代码生成器 适配 MybatisPlus
|
6 years ago |
|
疯狂的狮子li
|
2841620be6
|
初始化项目
|
6 years ago |
|
疯狂的狮子li
|
b279aa391c
|
删除文件 ruoyi
|
6 years ago |
|
RuoYi
|
a5dce6cccc
|
防止db字段名为一个字母导致出现生成异常
|
6 years ago |
|
RuoYi
|
fee8a5955b
|
若依 2.0
|
6 years ago |
