songjinsheng
|
11b8a3db44
|
Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java
# ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
# ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
# ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
# ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
# ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
# ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
# ruoyi-ui/src/views/tool/swagger/index.vue
|
2022-06-22 15:53:36 +08:00 |
|
songjinsheng
|
8918116dbd
|
测试
|
2022-06-22 15:43:23 +08:00 |
|
qdxkrs
|
498a502c02
|
添加swagger 新界面
|
2022-05-24 12:01:43 +08:00 |
|
RuoYi
|
9c3b53b701
|
用户管理左侧树型组件增加选中高亮保持
|
2022-05-13 15:02:16 +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
|
cbe405f6ea
|
ui code format
|
2022-05-01 20:22:25 +08:00 |
|
RuoYi
|
de5ae4a05e
|
添加页签openPage支持传递参数
|
2022-04-08 15:42:10 +08:00 |
|
RuoYi
|
a854e0ca8e
|
若依 3.8.2
|
2022-04-01 08:30:48 +08:00 |
|
RuoYi
|
eaa12de740
|
添加新群号：167385320
|
2022-03-22 16:47:56 +08:00 |
|
RuoYi
|
6130bebbb3
|
开启TopNav没有子菜单情况隐藏侧边栏
|
2022-03-06 09:03:44 +08:00 |
|
SG
|
07dfef48be
|
修改提示
|
2022-03-05 12:28:44 +00:00 |
|
RuoYi
|
cb8f5de5af
|
修复表单清除元素位置未垂直居中问题(I4V27B)
|
2022-03-04 19:24:28 +08:00 |
|
fuzui
|
96edba7eec
|
fix: 服务监控中运行参数显示条件错误
|
2022-02-26 03:20:50 +08:00 |
|
RuoYi
|
927b05713a
|
组件fileUpload支持多文件同时选择上传
|
2022-02-25 11:51:29 +08:00 |
|
RuoYi
|
bb65cd1976
|
代码生成子表支持日期/字典配置
|
2022-02-24 09:28:51 +08:00 |
|
“lumingsyc”
|
9aaa9ce8aa
|
优化部门管理页面email字段的表单验证多余的单引号
|
2022-02-23 20:00:47 +08:00 |
|
RuoYi
|
4d8bd8805b
|
优化个人中心页面email字段的表单验证多余的单引号
|
2022-02-23 16:54:59 +08:00 |
|
RuoYi
|
54c6c4e547
|
服务监控新增运行参数信息显示
|
2022-02-20 16:06:33 +08:00 |
|
RuoYi
|
b7b4364db2
|
代码生成编辑修改打开新页签
|
2022-02-12 13:14:09 +08:00 |
|
稚屿
|
a29201a248
|
修正单词拼写错误
|
2022-02-09 08:46:54 +08:00 |
|
RuoYi
|
d7ca248bc8
|
update copyright 2022
|
2022-01-14 11:47:25 +08:00 |
|
RuoYi
|
9bd7509e87
|
添加新群号：264312783
|
2022-01-11 09:02:16 +08:00 |
|
RuoYi
|
9f7acd4cf9
|
优化部门修改缩放后出现的错位问题
|
2022-01-08 09:23:45 +08:00 |
|
RuoYi
|
cb6228800b
|
代码生成新增Java类型Boolean
|
2022-01-01 09:28:52 +08:00 |
|
RuoYi
|
6353f4ff09
|
若依 3.8.1
|
2021-12-31 00:00:06 +08:00 |
|
RuoYi
|
d51e7cbb51
|
用户管理部门查询选择节点后分页参数初始
|
2021-12-29 11:04:09 +08:00 |
|
RuoYi
|
0e771a6c1b
|
升级spring-boot到最新版本2.5.8
|
2021-12-27 12:38:59 +08:00 |
|
18297093310
|
47b67331d4
|
修改重置表单bug
|
2021-12-17 03:06:25 +00:00 |
|
RuoYi
|
06aef0587a
|
用户导入提示溢出则显示滚动条
|
2021-12-16 09:50:26 +08:00 |
|
RuoYi
|
44ce6774dc
|
代码生成预览支持复制内容
|
2021-12-09 09:57:02 +08:00 |
|
RuoYi
|
850b98337b
|
修正用户分配角色属性错误
|
2021-12-06 20:58:10 +08:00 |
|
RuoYi
|
6bfae2652f
|
若依 3.8.0
|
2021-12-01 08:53:11 +08:00 |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
2021-11-30 11:15:17 +08:00 |
|
RuoYi
|
89e7cb19b9
|
注册成功提示类型success
|
2021-11-26 18:11:57 +08:00 |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
2021-11-22 18:06:44 +08:00 |
|
RuoYi
|
421593c0ba
|
添加新群号：101539465
|
2021-11-20 12:09:53 +08:00 |
|
RuoYi
|
91ad85aec1
|
添加新群号：264312783
|
2021-11-19 15:20:54 +08:00 |
|
RuoYi
|
d1eacc1d1c
|
新增tab对象简化页签操作
|
2021-11-19 14:53:40 +08:00 |
|
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
2021-11-17 11:57:17 +08:00 |
|
RuoYi
|
bbbe83b737
|
添加新群号：101539465
|
2021-11-02 14:40:21 +08:00 |
|
RuoYi
|
8a7dcf8a80
|
修正错别字
|
2021-10-25 10:26:00 +08:00 |
|
RuoYi
|
4fdb0f48ec
|
同步element2.15.6表格样式
|
2021-10-10 11:23:04 +08:00 |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
2021-09-27 10:38:29 +08:00 |
|
疯狂的狮子li
|
eaa3baab3c
|
update 代码生成编辑页面 拼写错误修正
|
2021-09-24 10:06:23 +08:00 |
|
RuoYi
|
1a5881b1d0
|
修正服务监控磁盘变量
|
2021-09-23 19:09:22 +08:00 |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:38:16 +08:00 |
|
RuoYi
|
a292cccb63
|
代码生成点击预览重置激活tab
|
2021-09-18 18:58:03 +08:00 |
|
yjb
|
aaae404b2a
|
Cron表达式生成器关闭时销毁，避免再次打开时存在上一次修改的数据
|
2021-09-17 19:14:41 +08:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|