港务局后台
 
 
 
 
 
Go to file
zhaoyu 5deb7d2b03 Merge branch '0206czks' into 0205cmt
# Conflicts:
#	pom.xml
#	src/main/java/com/zcloud/aspect/DockingAspect.java
#	src/main/java/com/zcloud/config/ShiroConfiguration.java
#	src/main/java/com/zcloud/config/StartWebsocketServer.java
#	src/main/java/com/zcloud/controller/app/AppPromiseController.java
#	src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java
#	src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
#	src/main/java/com/zcloud/controller/bus/HiddenExamineController.java
#	src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java
#	src/main/java/com/zcloud/controller/bus/RiskPointController.java
#	src/main/java/com/zcloud/controller/bus/RiskUnitController.java
#	src/main/java/com/zcloud/controller/filemanager/MfolderController.java
#	src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java
#	src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java
#	src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java
#	src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java
#	src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
#	src/main/java/com/zcloud/controller/map/MapController.java
#	src/main/java/com/zcloud/controller/map/MapEightController.java
#	src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
#	src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
#	src/main/java/com/zcloud/controller/system/HeadController.java
#	src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java
#	src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java
#	src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
#	src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java
#	src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java
#	src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
#	src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java
#	src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java
#	src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
#	src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java
#	src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
#	src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java
#	src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java
#	src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java
#	src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java
#	src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java
#	src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
#	src/main/java/com/zcloud/service/system/UsersService.java
#	src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
#	src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
#	src/main/java/com/zcloud/util/Const.java
#	src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
#	src/main/java/com/zcloud/util/HiddenExcelImgView.java
#	src/main/java/com/zcloud/util/HttpClientService.java
#	src/main/java/com/zcloud/util/HttpRequestUtil.java
#	src/main/java/com/zcloud/util/MD5.java
#	src/main/java/com/zcloud/util/ReturnMap.java
#	src/main/java/com/zcloud/util/Smb.java
#	src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java
#	src/main/java/com/zcloud/util/hk/HKUtil.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application.properties
#	src/main/resources/config/sysSet.ini
#	src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
#	src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml
#	src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
#	src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
#	src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
#	src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml
#	src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml
#	src/main/resources/mybatis/datasource/bus/PromiseMapper.xml
#	src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml
#	src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml
#	src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml
#	src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml
#	src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
#	src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
#	src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
#	src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
#	src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml
#	src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
#	src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
#	src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
#	src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
#	src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml
#	src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml
#	src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml
#	src/main/resources/mybatis/datasource/mysql1.sql
#	src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
#	src/main/resources/mybatis/datasource/system/CorpPathMapper.xml
#	src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
#	src/main/resources/mybatis/datasource/system/PoliceMapper.xml
#	src/main/resources/mybatis/datasource/system/UsersMapper.xml
#	src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml
#	src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
#	src/main/resources/mybatis/dsno2/bus/NoticeRegulatoryMapper.xml
#	src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/AIWarningMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/PersonnelManagementMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml
#	src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml
#	src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml
#	src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml
#	src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml
#	src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml
2024-02-06 13:55:09 +08:00
.mvn/wrapper 初始化曹煤炭 2024-02-06 11:02:25 +08:00
src/main Merge branch '0206czks' into 0205cmt 2024-02-06 13:55:09 +08:00
.gitignore 初始化沧州矿石 2024-02-06 11:05:20 +08:00
1703230140663.jpeg 初始化沧州矿石 2024-02-06 11:05:20 +08:00
hs_err_pid21732.log 初始化沧州矿石 2024-02-06 11:05:20 +08:00
hs_err_pid46004.log 初始化沧州矿石 2024-02-06 11:05:20 +08:00
mvnw 初始化曹煤炭 2024-02-06 11:02:25 +08:00
mvnw.cmd 初始化曹煤炭 2024-02-06 11:02:25 +08:00
pom.xml Merge branch '0206czks' into 0205cmt 2024-02-06 13:55:09 +08:00
replay_pid21732.log 初始化沧州矿石 2024-02-06 11:05:20 +08:00
replay_pid46004.log 初始化沧州矿石 2024-02-06 11:05:20 +08:00
更新.md 初始化沧州矿石 2024-02-06 11:05:20 +08:00