Commit Graph

991 Commits

Author SHA1 Message Date
songjinsheng
42e4acf3dd 新增字典功能 2022-05-30 10:11:39 +08:00
qdxkrs
498a502c02 添加swagger 新界面 2022-05-24 12:01:43 +08:00
songjinsheng
5c0a93f679 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev 2022-05-24 11:29:25 +08:00
songjinsheng
264a5d910f 修改接口 2022-05-24 11:29:11 +08:00
qdxkrs
15bc756bd4 修改冲突文件 2022-05-23 14:38:09 +08:00
qdxkrs
c424d5cd89 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
2022-05-23 14:37:16 +08:00
qdxkrs
9b784c99ed 修改bug 2022-05-23 14:36:19 +08:00
songjinsheng
5041f3f92f 注解修改 2022-05-23 14:17:46 +08:00
songjinsheng
f4caf10bd3 合并更新 2022-05-23 09:49:01 +08:00
songjinsheng
bb6fb94038 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:1
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
2022-05-23 09:48:47 +08:00
songjinsheng
7cfae514ea 控制器修改 2022-05-23 09:42:20 +08:00
qdxkrs
d262ec6b72 更新资源 2022-05-23 09:39:52 +08:00
qdxkrs
a51c6872d8 飞机✈保佑 2022-05-20 16:59:45 +08:00
songjinsheng
afa068f477 修改mapper 2022-05-20 15:17:51 +08:00
qdxkrs
c6fa415356 优化目录 2022-05-20 14:42:13 +08:00
qdxkrs
6006a9f18c 优化项目结构 2022-05-20 14:27:08 +08:00
songjinsheng
1722abfae7 Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms into dev 2022-05-20 14:20:17 +08:00
songjinsheng
57db36e015 no message 2022-05-20 14:19:34 +08:00
songjinsheng
43e3d8cfea 修改控制器 2022-05-20 14:19:25 +08:00
qdxkrs
1c16fc1d4a 添加基类 2022-05-20 14:18:53 +08:00
songjinsheng
598860d544 11 2022-05-20 11:56:55 +08:00
songjinsheng
95542bf4c9 Merge branch 'master' into test 2022-05-20 09:00:37 +08:00
songjinsheng
3598fafe66 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2022-05-20 08:59:45 +08:00
songjinsheng
de1dd3a808 功能迭代 2022-05-20 08:56:41 +08:00
RuoYi
9c3b53b701 用户管理左侧树型组件增加选中高亮保持 2022-05-13 15:02:16 +08:00
songjinsheng
f2cb431c90 Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms
# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml
2022-05-11 17:27:34 +08:00
songjinsheng
9facc1b682 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2022-05-11 16:40:50 +08:00
qdxkrs
93835778ad 修改配置 2022-05-11 16:40:13 +08:00
songjinsheng
8020eabaa9 更新 2022-05-11 15:58:35 +08:00
RuoYi
5693bbe1f5 升级oshi到最新版本6.1.6 2022-05-11 09:58:25 +08:00
RuoYi
0055f479cb 修复字典数据显示不全问题(I55MR3) 2022-05-09 20:27:09 +08:00
RuoYi
1c41b701dd 优化excel创建表格样式 2022-05-09 17:37:33 +08:00
RuoYi
9476f7f616 升级spring-boot到最新版本2.5.13 2022-05-01 20:22:35 +08:00
RuoYi
cbe405f6ea ui code format 2022-05-01 20:22:25 +08:00
RuoYi
7414bc492e 修改代码生成树选择组件 2022-04-25 10:27:06 +08:00
RuoYi
6f14087a16 修改显示顺序orderNum类型为整型 2022-04-25 10:23:47 +08:00
RuoYi
328d4b916d Excel注解支持color字体颜色 2022-04-23 20:53:16 +08:00
RuoYi
b42a8176ca 设置分页参数默认值 2022-04-17 10:29:12 +08:00
RuoYi
2a9beec31d 检查定时任务bean所在包名是否为白名单配置 2022-04-16 22:06:25 +08:00
RuoYi
910fe6261b 新增获取不带后缀文件名称方法 2022-04-16 22:06:15 +08:00
若依
0c820b96d8
!471 新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们
Merge pull request !471 from XCSDN/N/A
2022-04-16 13:53:10 +00:00
XCSDN
c3c49a05c2
新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们 2022-04-16 06:02:07 +00:00
RuoYi
68a616d7c7 升级element-ui到最新版本2.15.8 2022-04-15 09:32:21 +08:00
RuoYi
a0447de061 字典类型必须以字母开头,且只能为(小写字母,数字,下滑线) 2022-04-15 09:31:51 +08:00
若依
46db06a22b
!465 update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java.
Merge pull request !465 from XCSDN/N/A
2022-04-15 01:17:21 +00:00
RuoYi
de5ae4a05e 添加页签openPage支持传递参数 2022-04-08 15:42:10 +08:00
XCSDN
c0d430f4e5
update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java.
字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成
防止由于字典类型不符合前端开发规范而报错
2022-04-07 04:57:56 +00:00
RuoYi
d910888181 代码生成树表新增(展开/折叠) 2022-04-07 10:56:40 +08:00
RuoYi
db2dfee6ae 用户缓存信息添加部门ancestors祖级列表 2022-04-07 09:50:42 +08:00
RuoYi
d311d56bbf 修复Excel注解prompt/combo同时使用不生效问题 2022-04-03 18:28:30 +08:00