疯狂的狮子li
|
e19e2fd9cc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2020-07-23 09:54:57 +08:00 |
|
RuoYi
|
b2d79b62d1
|
代码生成支持选择上级菜单
|
2020-07-21 11:21:20 +08:00 |
|
疯狂的狮子li
|
f0bee6af63
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
|
2020-06-29 09:08:18 +08:00 |
|
RuoYi
|
7a9564ced5
|
修复代码生成点击多次表修改数据不变化的问题
|
2020-06-24 17:17:22 +08:00 |
|
疯狂的狮子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 |
|
RuoYi
|
441da7ecd7
|
添加handle控制允许拖动的元素
|
2020-04-01 12:21:48 +08:00 |
|
RuoYi
|
ed04c24eb3
|
代码生成列支持拖动排序
|
2020-04-01 09:52:49 +08:00 |
|
疯狂的狮子li
|
bed1fd98ff
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/login/auth-redirect.vue
ruoyi-ui/src/views/login/components/SocialSignin.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-03-02 16:15:24 +08:00 |
|
RuoYi
|
f18b3bc6be
|
代码生成字段描述可编辑
|
2020-02-28 20:29:19 +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
|
687e67dbea
|
修正关键词错误
|
2019-12-16 11:26:39 +08:00 |
|
RuoYi
|
fee8a5955b
|
若依 2.0
|
2019-12-02 09:28:11 +08:00 |
|