Commit Graph

23 Commits (1fb7eead4aca880c278231c9fe645c117b8cdabe)

Author SHA1 Message Date
songwenxuan 1fb7eead4a 人员定位详情 2024-01-29 08:43:41 +08:00
songwenxuan 27786297e9 地图代码 2024-01-24 09:50:08 +08:00
zhangyue 50a8f7b24f 人员定位 2024-01-21 09:30:15 +08:00
songwenxuan a9a3026875 地图代码 2024-01-19 15:36:06 +08:00
songwenxuan aa554a0f19 地图代码 2024-01-19 09:50:13 +08:00
zhangyue 8f1506cda4 合并Map相关功能 2024-01-17 14:05:11 +08:00
zhangyue f5f001d7bb 连接oracle 2024-01-17 09:54:58 +08:00
zhangyue b06a93f468 初始化 2024-01-15 18:28:47 +08:00
zhangyue 4a13c01caf 测试删除 2024-01-10 13:32:46 +08:00
songwenxuan 577df3bc45 门禁 人员闸机相关接口 2024-01-10 08:54:57 +08:00
zhangyue 905576b68b 视频获取 2024-01-09 19:20:45 +08:00
zhangyue 25077ea9a6 Merge branch 'cmt1.0' into dev
# Conflicts:
#	src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
#	src/main/java/com/zcloud/util/ReturnMap.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-local.properties
#	src/main/resources/application-master.properties
#	src/main/resources/application.properties
#	src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
#	src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml
#	src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml
2024-01-08 15:43:52 +08:00
DESKTOP-7VLMG81\Administrator 84245b934c 地图人员定位 2024-01-08 14:17:14 +08:00
zhangyue c07b6534b9 Merge branch 'dev1' into dev 2024-01-08 10:52:27 +08:00
zhangyue df4f35d1fb 门口门禁 2024-01-08 10:30:17 +08:00
dearlin 7073565e0b add: 沧州矿石代码同步加地图版本 2023-12-17 15:29:45 +08:00
limingyu 98dc83e051 延时监火改为多人同时监火,在同一个部门中都可以查看和发布监火信息 2023-12-11 10:00:16 +08:00
limingyu 335d1e04fd 曹妃甸动火作业搬到港务局3 2023-12-05 13:45:52 +08:00
limingyu ff9dc890bf Merge remote-tracking branch 'origin/dev' into lmy20231113 2023-11-17 14:19:56 +08:00
limingyu 5b22778601 曹妃甸动火作业搬到港务局 2023-11-14 10:16:26 +08:00
dearlin 1197111074 fix:smb空指针问题修复 2023-11-08 17:15:45 +08:00
dearlin 8f1868e6cd 改造配置文件 2023-11-08 10:24:18 +08:00
guoyuepeng 9e993610b0 初始化 2023-11-07 09:32:12 +08:00