hsdllcw
|
f09cd2a2bf
|
Merge remote-tracking branch 'upstream/master' into dev_lcw
# Conflicts:
# pom.xml
# ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
# ruoyi-ui/src/views/index.vue
|
2025-03-20 15:06:43 +08:00 |
RuoYi
|
a256618d5d
|
优化代码
|
2025-03-11 12:52:17 +08:00 |
|
RuoYi
|
8c096cba8d
|
优化isAdmin方法,避免脱敏模块security依赖
|
2025-03-07 12:56:31 +08:00 |
|
RuoYi
|
fc8069a250
|
优化导出Excel日期格式双击离开后与设定的格式不一致问题
|
2025-03-05 18:13:12 +08:00 |
|
RuoYi
|
4aa261e8f7
|
优化定时任务字符包含多个括号导致数据错误
|
2025-03-05 18:10:12 +08:00 |
|
RuoYi
|
3dcee7057d
|
优化代码
|
2025-03-05 18:01:33 +08:00 |
|
hsdllcw
|
343e5496e3
|
Merge remote-tracking branch 'upstream/master' into dev_lcw
# Conflicts:
# ruoyi-ui/src/views/index.vue
|
2025-02-11 10:28:39 +08:00 |
|
RuoYi
|
88ad5a2c19
|
优化导入带标题文件关闭清理
|
2024-12-25 16:24:38 +08:00 |
|
RuoYi
|
b45dc2ec25
|
update sqlkeyword
|
2024-12-25 16:24:02 +08:00 |
|
hsdllcw
|
46e1f34b3e
|
[feat] 升级版本至3.6.5.0.4
|
2024-12-14 16:42:37 +08:00 |
|
RuoYi
|
6c3b01c3c5
|
Excel注解支持wrapText是否允许内容换行
|
2024-12-03 09:07:04 +08:00 |
|
RuoYi
|
8faea60191
|
修复导出子列表对象只能在最后的问题
|
2024-12-02 20:37:12 +08:00 |
|
hsdllcw
|
67413e3c12
|
[feat] 版本更新
|
2024-11-30 14:55:25 +08:00 |
|
hsdllcw
|
e6634b7eb4
|
[feat] SysUser返回第三方平台id用以判断是否绑定
|
2024-11-30 10:35:06 +08:00 |
|
hsdllcw
|
21495202ff
|
[feat] 新增通过微信unionId注册的功能
|
2024-11-20 17:51:00 +08:00 |
|
hsdllcw
|
beb41bb782
|
Merge remote-tracking branch 'upstream/master' into dev_lcw
# Conflicts:
# pom.xml
# ruoyi-api/pom.xml
# ruoyi-api/ruoyi-api-system/pom.xml
# ruoyi-auth/pom.xml
# ruoyi-common/pom.xml
# ruoyi-common/ruoyi-common-core/pom.xml
# ruoyi-common/ruoyi-common-datascope/pom.xml
# ruoyi-common/ruoyi-common-datasource/pom.xml
# ruoyi-common/ruoyi-common-log/pom.xml
# ruoyi-common/ruoyi-common-redis/pom.xml
# ruoyi-common/ruoyi-common-seata/pom.xml
# ruoyi-common/ruoyi-common-security/pom.xml
# ruoyi-common/ruoyi-common-sensitive/pom.xml
# ruoyi-common/ruoyi-common-swagger/pom.xml
# ruoyi-gateway/pom.xml
# ruoyi-modules/pom.xml
# ruoyi-modules/ruoyi-file/pom.xml
# ruoyi-modules/ruoyi-gen/pom.xml
# ruoyi-modules/ruoyi-job/pom.xml
# ruoyi-modules/ruoyi-system/pom.xml
# ruoyi-ui/src/views/index.vue
# ruoyi-visual/pom.xml
# ruoyi-visual/ruoyi-monitor/pom.xml
|
2024-11-20 10:51:19 +08:00 |
|
RuoYi
|
6d34cdb8a3
|
若依 3.6.5
|
2024-11-13 08:38:24 +08:00 |
|
RuoYi
|
b3ef4adfed
|
支持自定义显示Excel属性列
|
2024-11-07 22:25:48 +08:00 |
|
hsdllcw
|
e07bbf122d
|
[feat] 新增根据手机号模糊查询用户的接口
|
2024-11-07 12:05:39 +08:00 |
|
hsdllcw
|
205d5b1129
|
Merge remote-tracking branch 'upstream/master' into dev_lcw
# Conflicts:
# ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
# ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
|
2024-11-07 11:59:30 +08:00 |
|
RuoYi
|
856c471472
|
优化代码
|
2024-11-06 10:20:18 +08:00 |
|
hsdllcw
|
08299ccd09
|
[feat] 新增编辑用户信息的内部接口
|
2024-10-25 16:53:27 +08:00 |
|
hsdllcw
|
8436630787
|
[feat] 更新版本号
|
2024-09-29 14:04:49 +08:00 |
|
hsdllcw
|
8f0dbe9fc5
|
[feat] 新增WebSocket鉴权
|
2024-09-29 10:42:22 +08:00 |
|
hsdllcw
|
3ec8590120
|
Merge remote-tracking branch 'upstream/master' into dev_lcw
# Conflicts:
# pom.xml
# ruoyi-common/ruoyi-common-core/pom.xml
# ruoyi-common/ruoyi-common-swagger/pom.xml
# ruoyi-gateway/pom.xml
# ruoyi-modules/ruoyi-file/pom.xml
# ruoyi-modules/ruoyi-gen/pom.xml
# ruoyi-modules/ruoyi-job/pom.xml
# ruoyi-modules/ruoyi-system/pom.xml
# sql/ry_config_20240902.sql
|
2024-09-23 17:25:26 +08:00 |
|
RuoYi
|
75f3275e15
|
修复角色禁用权限不失效问题
|
2024-09-21 12:01:48 +08:00 |
|
RuoYi
|
3b499b1344
|
使用SpringDoc代替Swagger
|
2024-08-30 11:26:57 +08:00 |
|
hsdllcw
|
84570cb6cf
|
[feat] 通过用户ID查询用户信息
|
2024-08-23 09:49:35 +08:00 |
|
hsdllcw
|
de924c7ee0
|
[feat] 升级版本号
|
2024-08-14 09:42:44 +08:00 |
|
RuoYi
|
0680d1ed1f
|
优化数据权限代码
|
2024-06-05 12:48:37 +08:00 |
|
RuoYi
|
fa2a28e877
|
新增数据脱敏过滤注解
|
2024-04-08 13:16:52 +08:00 |
|
RuoYi
|
e2f1b31735
|
若依 3.6.4
|
2024-04-01 09:28:45 +08:00 |
|
RuoYi
|
735273d69f
|
Excel注解ColumnType类型新增文本
|
2024-03-22 16:44:18 +08:00 |
|
RuoYi
|
4f7bcef44c
|
定时任务白名单配置范围缩小
|
2024-03-11 11:23:38 +08:00 |
|
RuoYi
|
2dca6f0a12
|
优化匹配方式
|
2024-03-01 21:55:28 +08:00 |
|
RuoYi
|
7df1b02476
|
优化数字金额大写转换精度丢失问题
|
2023-11-01 10:00:21 +08:00 |
|
RuoYi
|
db18477786
|
修复Excels导入时无法获取到readConverterExp内容转表达式问题
|
2023-08-21 16:01:55 +08:00 |
|
RuoYi
|
a5354083b9
|
Excel导入数据临时文件无法删除问题
|
2023-08-19 16:24:04 +08:00 |
|
RuoYi
|
1665fa2793
|
升级fastjson到最新版2.0.39
|
2023-08-15 12:24:16 +08:00 |
|
RuoYi
|
b2cb085f21
|
Excel自定义数据处理器增加单元格/工作簿对象
|
2023-08-14 19:20:04 +08:00 |
|
RuoYi
|
b18eced03d
|
若依 3.6.3
|
2023-07-07 08:30:21 +08:00 |
|
RuoYi
|
ee2fef02f8
|
排序属性orderBy参数限制长度
|
2023-07-06 22:29:30 +08:00 |
BearXuan
|
7c3d7b384c
|
注释名称与参数名不一致
|
2023-07-03 15:18:33 +08:00 |
|
RuoYi
|
356b451b2a
|
optimized code
|
2023-06-30 14:03:52 +08:00 |
maochd
|
102a5ac575
|
简化允许下载的文件规则判断
|
2023-04-18 13:56:59 +08:00 |
|
RuoYi
|
a3615e5c6c
|
优化代码
|
2023-04-10 18:14:54 +08:00 |
|
若依
|
84ba2dbd93
|
!310 完善ruoyi-file模块的upload接口在文件过大和文件名过长的情况下的返回值中的msg提示信息
Merge pull request !310 from pigwantacat/master
|
2023-03-29 02:39:08 +00:00 |
|
RuoYi
|
f8ad7ea3ce
|
支持自定义隐藏属性列过滤子对象
|
2023-03-18 10:45:29 +08:00 |
pigwantacat
|
504a4e8e66
|
完善ruoyi-file模块的upload接口在文件过大和文件名过长的情况下的返回值中的msg提示信息
|
2023-03-16 23:48:40 +08:00 |
wangfeiyu
|
4b21a3bc48
|
在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
|
2023-02-22 08:54:10 +08:00 |