隐患排查综合管控系统
上一版本: d853af | 补丁 | 提交对比
zhangfeng
2023-07-24 50304934a7a677800e94f15b0dd3f3b788a704ef
分支
用户 zhangfeng <1603559716@qq.com>
星期一, 七月 24, 2023 09:29 +0800
提交者 zhangfeng <1603559716@qq.com>
星期一, 七月 24, 2023 09:29 +0800
提交50304934a7a677800e94f15b0dd3f3b788a704ef
目录 2b16d7739581cbfadb91fc81f59e0c2c8f40467d 目录 | zip | gz
上一版本 d853af92d4172aee2a3ffee130e76ef02576e66b 查看 | 对比
0645153dfa233b51a749db73f9bd5a8c5127c595 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java
#	src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java
已修改27个文件
105 ■■■■■ 文件已修改
src/main/java/com/gk/hotwork/Config/Swagger/SwaggerConfig.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Config/Swagger/WebMvcConfig.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史