liulixin
|
cfcd363e36
|
闸机出入记录功能
|
2024-01-23 18:05:30 +08:00 |
 dearlin
|
faac07b1b7
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java
|
2024-01-23 09:32:50 +08:00 |
|
dearlin
|
d3cb7a2857
|
门禁进出记录
|
2024-01-23 09:32:02 +08:00 |
|
liulixin
|
5fd5380385
|
闸机出入记录注释添加
|
2024-01-23 08:57:14 +08:00 |
|
liulixin
|
36b64c11b1
|
门口门禁记录
|
2024-01-19 16:57:32 +08:00 |
|
liulixin
|
63cc479f4f
|
门口门禁记录
|
2024-01-19 16:56:47 +08:00 |
|
liulixin
|
34f27ebfd4
|
门口门禁记录
|
2024-01-19 15:39:45 +08:00 |
|
liulixin
|
dc28d0a652
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-19 09:27:36 +08:00 |
|
liulixin
|
19a797640d
|
体系文件批量上传
|
2024-01-19 09:27:10 +08:00 |
|
dearlin
|
d92c164b15
|
地图上展示八项作业相关
|
2024-01-19 08:53:29 +08:00 |
|
liulixin
|
8ddd4b1c63
|
体系文件批量上传
|
2024-01-19 08:48:17 +08:00 |
|
liulixin
|
3d79dc0c92
|
体系文件批量上传
|
2024-01-19 08:46:40 +08:00 |
|
liulixin
|
095be8743d
|
体系文件批量上传
|
2024-01-18 18:00:04 +08:00 |
|
liulixin
|
4962d4be11
|
风险点单元删除的ids数组追加
|
2024-01-18 17:06:44 +08:00 |
|
liulixin
|
456e48a8ba
|
风险点单元删除的ids数组追加
|
2024-01-18 17:00:57 +08:00 |
|
liulixin
|
bc92e6b594
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-18 15:50:10 +08:00 |
|
liulixin
|
9986f6e3ea
|
部门查询
|
2024-01-18 15:50:02 +08:00 |
|
dearlin
|
77830f3e83
|
八项作业，摄像头，体系文件
|
2024-01-18 15:21:11 +08:00 |
|
dearlin
|
5678f4451d
|
八项作业不显示扎点
|
2024-01-18 15:11:33 +08:00 |
|
dearlin
|
8883f58af7
|
体系文件下载地址
|
2024-01-18 14:36:21 +08:00 |
|
liulixin
|
aa5a53137d
|
体系文件同步
|
2024-01-18 14:29:45 +08:00 |
|
dearlin
|
95d325c6a5
|
港股对接沧州矿石地图代码
|
2024-01-17 16:01:16 +08:00 |
|
dearlin
|
1d87206d40
|
港股调试摄像头
|
2024-01-17 13:54:06 +08:00 |
|
liulixin
|
aa617724f1
|
承诺书bug
|
2024-01-16 15:10:34 +08:00 |
|
liulixin
|
163f532db9
|
CORPINFO_ID查询条件
追加
|
2024-01-16 12:00:35 +08:00 |
|
liulixin
|
57bd46e784
|
CORPINFO_ID查询条件
追加
|
2024-01-15 17:44:16 +08:00 |
|
dearlin
|
a512986859
|
地图上重点工程图层
|
2024-01-15 16:14:03 +08:00 |
|
dearlin
|
66ed85388f
|
港务局代码合并
|
2024-01-15 15:10:01 +08:00 |
|
dearlin
|
575b27f705
|
地图代码重构
|
2024-01-15 11:56:44 +08:00 |
|
dearlin
|
8439ee07b2
|
人员定位测试
|
2024-01-15 11:10:09 +08:00 |
|
liulixin
|
10ae5aabea
|
dockData
@DockAnnotation
CARDNO
追加
|
2024-01-12 17:02:35 +08:00 |
zhaoyu
|
1539163515
|
增加隐患数量
|
2024-01-11 18:02:12 +08:00 |
|
liulixin
|
5f53def846
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-11 16:39:14 +08:00 |
|
liulixin
|
2ab3f6c70e
|
dockData
@DockAnnotation
追加
|
2024-01-11 16:38:56 +08:00 |
|
zhaoyu
|
147d92c329
|
Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日
|
2024-01-11 15:49:37 +08:00 |
|
zhaoyu
|
722aaee5e0
|
动火搜索问题
|
2024-01-11 15:49:30 +08:00 |
 liujun
|
939ebb093a
|
地图application配置补充
|
2024-01-11 14:06:40 +08:00 |
|
dearlin
|
1830f4eb81
|
线上环境配置
|
2024-01-11 10:46:20 +08:00 |
|
zhaoyu
|
18f4514fde
|
Merge branch 'zy-2024-01-04-bug修复' into dev-2024年1月8日
|
2024-01-10 18:01:17 +08:00 |
|
liulixin
|
91f52699d4
|
add-log mq-日志记录
|
2024-01-10 16:53:30 +08:00 |
|
zhaoyu
|
4ef537536d
|
沧州较大隐患图片未同步问题
|
2024-01-09 17:42:02 +08:00 |
|
zhaoyu
|
fc7c6d7a55
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:40:37 +08:00 |
|
zhaoyu
|
e432c116f9
|
特级动火列表时间不对问题
|
2024-01-09 16:40:30 +08:00 |
|
zhaoyu
|
e14165e4cc
|
动火作业时间不对bug修复
|
2024-01-09 16:40:03 +08:00 |
|
liulixin
|
8ee622cdf2
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:13:25 +08:00 |
|
liulixin
|
fdaa0401fd
|
add-log
|
2024-01-09 16:13:13 +08:00 |
|
zhaoyu
|
74dccd002b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-09 16:12:57 +08:00 |
|
zhaoyu
|
bfb899e560
|
BUG修复 特级动火数据丢失问题
|
2024-01-09 16:12:50 +08:00 |
|
zhaoyu
|
98706069a5
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:11:31 +08:00 |
|
zhaoyu
|
ea14695b16
|
特级动火丢数据问题
|
2024-01-09 16:11:23 +08:00 |