RuoYi
|
1af0d1665c
|
数据权限判断对象类型
|
2020-08-28 15:45:54 +08:00 |
RuoYi
|
4e32788b36
|
修正数据库字符串类型nvarchar
|
2020-08-28 14:11:32 +08:00 |
RuoYi
|
068c3e6f0d
|
优化递归子节点
|
2020-08-28 10:14:59 +08:00 |
RuoYi
|
dd6640086e
|
代码生成树模板去掉多余双引号
|
2020-08-27 17:34:06 +08:00 |
RuoYi
|
be54188ba6
|
导出Excel调整targetAttr获取值方法,防止get方法不规范
|
2020-08-26 15:39:46 +08:00 |
疯狂的狮子li
|
fdbe943053
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
|
2020-08-26 15:30:25 +08:00 |
RuoYi
|
a4e2339f90
|
生成页面时不忽略remark属性
|
2020-08-26 14:24:37 +08:00 |
RuoYi
|
bf771ae5c8
|
Excel注解支持自动统计数据总和
|
2020-08-26 11:37:49 +08:00 |
疯狂的狮子li
|
184bb04bc2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/views/system/notice/index.vue
sql/ry_20200822.sql
|
2020-08-24 10:26:44 +08:00 |
RuoYi
|
fa5596bb20
|
Editor组件优化,支持自定义高度&图片冲突问题
|
2020-08-22 13:18:41 +08:00 |
RuoYi
|
eb30fc4b1a
|
修改公告内容字段类型
|
2020-08-22 13:11:40 +08:00 |
疯狂的狮子li
|
d464d8703c
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
|
2020-08-21 13:01:12 +08:00 |
疯狂的狮子li
|
1b82822d15
|
根据勾选列表是否显示 隐藏主键列
|
2020-08-19 17:32:34 +08:00 |
疯狂的狮子li
|
1cc8bc172b
|
修改代码生成 删除主键type注解配置 使用全局配置
|
2020-08-19 17:03:21 +08:00 |
RuoYi
|
0446d211df
|
设置默认排序顺序
|
2020-08-19 17:02:23 +08:00 |
疯狂的狮子li
|
5aeac1a8ae
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/utils/ruoyi.js
|
2020-08-19 17:01:43 +08:00 |
RuoYi
|
da146c2a70
|
Excel注解支持设置BigDecimal精度&舍入规则
|
2020-08-19 11:20:31 +08:00 |
RuoYi
|
7de5358dcd
|
升级fastjson到最新版1.2.73
|
2020-08-19 11:17:24 +08:00 |
RuoYi
|
549c7ee97a
|
代码生成添加select必填选项
|
2020-08-18 18:15:12 +08:00 |
RuoYi
|
5fcf342f5a
|
修改sass为node-sass,避免el-icon图标乱码
|
2020-08-18 17:36:20 +08:00 |
若依
|
c89722a7dd
|
!74 update ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java.
Merge pull request !74 from Lyy/N/A
|
2020-08-18 17:30:18 +08:00 |
若依
|
61e10f2783
|
!73 代码生成:select的表单验证失效
Merge pull request !73 from sunshine/master
|
2020-08-18 17:30:03 +08:00 |
若依
|
c6912ca1d5
|
!64 修改sass为node-sass,避免el-icon图标乱码
Merge pull request !64 from 心悦李国楠/dev-心悦
|
2020-08-18 17:27:19 +08:00 |
若依
|
5c4f0c5503
|
!65 根节点为子部门时,树状结构显示问题
Merge pull request !65 from GSTong/master
|
2020-08-18 17:21:51 +08:00 |
Lyy
|
4f7702b22a
|
update ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java.
修改注释,CRSF禁用
|
2020-08-17 17:05:33 +08:00 |
疯狂的狮子li
|
def4377226
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/ruoyi.js
|
2020-08-17 12:57:06 +08:00 |
sunshine
|
04e294b3e5
|
代码生成:select的表单验证失效
|
2020-08-17 12:08:34 +08:00 |
RuoYi
|
d596d5bb8e
|
还原 addDateRange js 函数
|
2020-08-13 12:08:24 +08:00 |
疯狂的狮子li
|
25afde4796
|
同步升级3.1
|
2020-08-13 11:28:11 +08:00 |
疯狂的狮子li
|
088bc98a43
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
|
2020-08-13 11:24:04 +08:00 |
RuoYi
|
8f9f0c04cc
|
若依 3.1
|
2020-08-13 10:27:56 +08:00 |
RuoYi
|
1bad003fe3
|
修改公私钥
|
2020-08-12 11:55:26 +08:00 |
疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.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/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/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
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-08-12 10:16:29 +08:00 |
RuoYi
|
ad4df6245d
|
优化防重复提交拦截器,请求没有消息头则使用地址
|
2020-08-11 11:24:55 +08:00 |
gst
|
0070297fe1
|
根节点为子部门时,树状结构显示问题
|
2020-08-11 10:59:02 +08:00 |
RuoYi
|
71ec44a545
|
修正在线用户日志记录类型
|
2020-08-10 17:26:11 +08:00 |
RuoYi
|
1efae4a588
|
优化防重复提交拦截器,接口请求非json数据不获取Body消息体
|
2020-08-10 17:10:34 +08:00 |
liguonan
|
650359c357
|
修改sass为node-sass,避免el-icon图标乱码
|
2020-08-10 16:28:50 +08:00 |
RuoYi
|
a78211ca00
|
优化上级菜单不能选择自己
|
2020-08-10 12:20:52 +08:00 |
RuoYi
|
74f52677be
|
表格右侧工具栏组件
|
2020-08-10 10:12:39 +08:00 |
若依
|
60d5c03e65
|
!63 重写表格工具栏右侧添加刷新&显隐查询栏
Merge pull request !63 from 平凡/重写表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-10 09:53:27 +08:00 |
疯狂的狮子li
|
4044ed23ea
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-ui/src/components/Editor/index.vue
|
2020-08-10 09:38:28 +08:00 |
平凡
|
5b04f388e9
|
重写表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-09 11:07:10 +08:00 |
RuoYi
|
a7eb07c7a0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-08-07 16:07:02 +08:00 |
RuoYi
|
d0b315f4a5
|
删除重复的placeholder
|
2020-08-07 16:03:45 +08:00 |
若依
|
a6051d4638
|
!60 代码注释错误
Merge pull request !60 from waylon/master
|
2020-08-07 15:56:44 +08:00 |
wanglei
|
c4ee9ea7c8
|
修复注释错误
|
2020-08-07 14:26:30 +08:00 |
RuoYi
|
7c39f92538
|
修复富文本空格和缩进保存后不生效问题
|
2020-08-07 12:26:15 +08:00 |
疯狂的狮子li
|
a9f4a4e111
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/ruoyi.js
|
2020-08-07 09:22:36 +08:00 |
RuoYi
|
51fa66f61a
|
唯一限制条件只返回单条数据
|
2020-08-05 14:28:45 +08:00 |