疯狂的狮子li
|
d9a0de20f8
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
# 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/vue/v3/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
|
2022-01-07 15:41:18 +08:00 |
|
RuoYi
|
db4c2d3dd5
|
代码生成列表图片支持预览
|
2022-01-04 20:27:08 +08:00 |
|
RuoYi
|
6353f4ff09
|
若依 3.8.1
|
2021-12-31 00:00:06 +08:00 |
|
疯狂的狮子li
|
ed659da488
|
发布 v3.5.0-release 正式版
|
2021-12-28 10:35:52 +08:00 |
|
疯狂的狮子li
|
295cd3670f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
|
2021-12-27 09:30:12 +08:00 |
|
RuoYi
|
e4df0c6da1
|
优化代码生成字典组重复问题
|
2021-12-24 14:51:33 +08:00 |
|
疯狂的狮子Li
|
63cb34b563
|
update 优化 pr 调整导包位置
|
2021-12-18 18:34:23 +08:00 |
|
抓蛙师
|
b87e45ce32
|
自动生成代码未引入此依赖
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
2021-12-18 16:07:24 +08:00 |
|
疯狂的狮子li
|
d600cdd8a0
|
add 代码生成增加 vue3 页面模板
|
2021-12-16 15:09:35 +08:00 |
|
疯狂的狮子li
|
d2c6e27d07
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/user/index.vue
|
2021-12-16 14:21:04 +08:00 |
|
疯狂的狮子li
|
30483dacfb
|
update 回滚错误修改
|
2021-12-16 11:52:55 +08:00 |
|
疯狂的狮子li
|
9d81d95700
|
update 代码生成 数据库功能使用 mapper 操作 规范用法避免滥用
|
2021-12-16 11:45:58 +08:00 |
|
RuoYi
|
fef7ead0d5
|
新增Vue3前端代码生成模板
|
2021-12-16 09:51:11 +08:00 |
|
疯狂的狮子li
|
3f97d19381
|
update [重磅更新] 重构分页 简化使用
|
2021-12-15 13:29:54 +08:00 |
|
疯狂的狮子Li
|
317f6d5c87
|
fix 修复代码生成 sql异常 屏蔽代码生成数据权限过滤
|
2021-12-14 23:47:59 +08:00 |
|
疯狂的狮子li
|
79fc16eeb7
|
fix 修复代码生成 导出注解错误
|
2021-12-13 10:02:32 +08:00 |
|
疯狂的狮子li
|
d4f49b10d7
|
update 重构代码生成分页相关 基于新分页方法
|
2021-12-03 15:58:16 +08:00 |
|
疯狂的狮子li
|
5ba39c0086
|
update 重构分页 基于 分页新方法
|
2021-12-03 15:57:58 +08:00 |
|
疯狂的狮子li
|
7eedf37149
|
update 优化 pr !118 代码结构
|
2021-12-02 18:47:18 +08:00 |
|
zendwang
|
ac38f7b909
|
fix 为Transactional注解设置rollback属性
|
2021-12-02 18:34:49 +08:00 |
|
RuoYi
|
6bfae2652f
|
若依 3.8.0
|
2021-12-01 08:53:11 +08:00 |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
2021-11-29 13:58:42 +08:00 |
|
疯狂的狮子li
|
a8a4f2101d
|
add 增加 mapper 目录下 package-info 防止建错目录
|
2021-11-29 09:59:53 +08:00 |
|
疯狂的狮子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 |
|
Ricky
|
664192da0b
|
升级velocity到最新版本2.3（语法升级）
|
2021-11-25 15:18:02 +08:00 |
|
Ricky
|
64f6a69d9a
|
修复代码生成复选框字典遗漏问题
|
2021-11-25 13:54:49 +08:00 |
|
RuoYi
|
16734b1d88
|
升级velocity到最新版本2.3
|
2021-11-24 15:03:04 +08:00 |
|
fuzui
|
b4f032fab4
|
删除代码生成中冗余的导出方法
|
2021-11-24 02:48:35 +08:00 |
|
疯狂的狮子li
|
f8487f581b
|
update 补全所有接口 单参数接口文档
|
2021-11-18 17:01:23 +08:00 |
|
疯狂的狮子li
|
64add90edd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-ui/package.json
ruoyi-ui/src/api/monitor/logininfor.js
ruoyi-ui/src/api/monitor/operlog.js
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/api/system/post.js
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-11-17 19:14:03 +08:00 |
|
lihy2021
|
8de93d35ed
|
代码生成模板缺少事务
|
2021-11-17 07:56:24 +00:00 |
|
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
2021-11-17 11:57:17 +08:00 |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
2021-11-03 15:02:29 +08:00 |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
2021-10-29 09:14:49 +08:00 |
|
疯狂的狮子li
|
3353ead5d3
|
update 搜索框 更新文本域生成 用于模糊查询
|
2021-10-28 09:45:29 +08:00 |
|
疯狂的狮子li
|
284f47e76c
|
update 代码生成 改为生成抽象实体
|
2021-10-15 16:19:51 +08:00 |
|
疯狂的狮子li
|
b47f8fd784
|
update 代码生成 改为生成抽象实体
|
2021-10-15 16:19:42 +08:00 |
|
疯狂的狮子li
|
a6fb88d74c
|
update [重大更新]全业务 增加 接口文档注解 格式化代码
|
2021-10-15 15:19:42 +08:00 |
|
疯狂的狮子li
|
f38d7811e3
|
update 优化 代码生成常量 关于 BO VO 注释
|
2021-09-28 18:26:32 +08:00 |
|
疯狂的狮子li
|
c7071752a7
|
update 优化代码生成 导入表 列表返回 主键默认选中
|
2021-09-28 18:26:30 +08:00 |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
2021-09-28 09:41:37 +08:00 |
|
疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
2021-09-27 17:24:37 +08:00 |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
2021-09-27 10:38:29 +08:00 |
|
疯狂的狮子li
|
125547f08f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
ruoyi-ui/src/views/monitor/server/index.vue
|
2021-09-26 10:05:29 +08:00 |
|
疯狂的狮子Li
|
02ce9868a7
|
fix 自动生成代码漏掉 this.#[[$modal]]#.msgError
|
2021-09-24 05:41:55 +00:00 |
|
疯狂的狮子li
|
03b31652a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.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
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2021-09-23 18:53:17 +08:00 |
|
RuoYi
|
fa124aeb8b
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:57:29 +08:00 |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:38:16 +08:00 |
|
疯狂的狮子li
|
e9b0289eff
|
update 优化代码生成 根据MP生成特性 调整导入表结构默认值合理化
|
2021-09-22 11:09:42 +08:00 |
|
疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-09-18 16:01:52 +08:00 |
|