森林防火
parent: 9333c9 | 补丁 | 提交对比
无关风月
2024-07-30 f3cba59fc471e42936a10d8e923fd097e80cbc97
refs
用户 无关风月 <443237572@qq.com>
星期二, 七月 30, 2024 10:12 +0800
提交者 无关风月 <443237572@qq.com>
星期二, 七月 30, 2024 10:12 +0800
提交f3cba59fc471e42936a10d8e923fd097e80cbc97
目录 ba09ff291f6891294acc04b27dd98b0553cc3c27 目录 | zip | gz
parent 9333c9236483d5f5fd0d434d564a6210cfcdd527 查看 | 对比
24f7e4c21f6b6375f791b5132d25373255c1d464 查看 | 对比 
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention

# Conflicts:
#	ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
#	ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
11个文件已修改
46 ■■■■■ 已修改文件
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/InventoriesSuppliesInfoService.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java 17 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史