songjinsheng
|
b8d90525ae
|
地图服务
|
2022-06-30 16:06:16 +08:00 |
|
songjinsheng
|
b51521dac7
|
修改mapper
|
2022-06-28 11:58:12 +08:00 |
|
songjinsheng
|
0719379052
|
配置bean
|
2022-06-24 10:40:21 +08:00 |
|
songjinsheng
|
f52a876226
|
修改控制器及新增城市功能
|
2022-06-24 10:28:33 +08:00 |
|
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 |
|
songjinsheng
|
43ee95a198
|
修改查询方法，增加查询条件
|
2022-06-20 17:06:48 +08:00 |
|
qdxkrs
|
7c5e92246f
|
升级依赖包
|
2022-06-16 14:13:41 +08:00 |
|
songjinsheng
|
fafe483b53
|
修改bug
|
2022-06-16 11:58:56 +08:00 |
|
qdxkrs
|
6148ca9ae8
|
修改滑动验证码
|
2022-06-16 10:50:51 +08:00 |
|
songjinsheng
|
3006b3c751
|
增加redis密码
|
2022-06-16 09:49:49 +08:00 |
|
songjinsheng
|
e9e8ea36b7
|
验证码修改
|
2022-06-16 09:49:27 +08:00 |
|
songjinsheng
|
c9ee01dd1f
|
验证码
|
2022-06-16 09:24:27 +08:00 |
|
songjinsheng
|
2de946adb8
|
增加各个数据表数据上床功能，切换数据库
|
2022-06-08 17:18:59 +08:00 |
|
songjinsheng
|
a4976eff13
|
修改字典和token过期时间
|
2022-05-31 10:47:05 +08:00 |
|
songjinsheng
|
bd12230d7e
|
修改token过期时间
|
2022-05-30 10:17:07 +08:00 |
|
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 |
|