|
|
795bb8cfb5
|
工作流修改IP接口
|
2024-06-13 18:18:07 +08:00 |
|
|
|
f223b67be0
|
Merge branch 'guoshengxiongtemp' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/async/AsyncWorker.java
|
2024-06-13 14:16:02 +08:00 |
|
|
|
c88492ff5a
|
智能安全帽-实时数据-围栏中间表
|
2024-06-13 14:12:17 +08:00 |
|
|
|
10889f8b6e
|
配置一周视频信息
|
2024-06-13 10:32:59 +08:00 |
|
|
|
74f9fce37e
|
海康下发修改
|
2024-06-13 00:04:20 +08:00 |
|
|
|
551ca8ec67
|
海康下发修改
|
2024-06-12 23:28:31 +08:00 |
|
|
|
808b64bd40
|
海康下发bug修改
|
2024-06-12 21:55:13 +08:00 |
|
|
|
fc3187fa72
|
海康bug修改
|
2024-06-12 21:25:27 +08:00 |
|
|
|
0336abec3b
|
工作流修改判断
|
2024-06-12 19:28:26 +08:00 |
|
|
|
fb91b3350f
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-12 16:10:18 +08:00 |
|
|
|
3e5a90f4a8
|
安全修改
|
2024-06-12 16:09:48 +08:00 |
|
|
|
c95c61d45b
|
特殊作业修改
|
2024-06-12 14:21:54 +08:00 |
|
|
|
1ef7d759e8
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-12 14:19:24 +08:00 |
|
|
|
2d69ba4740
|
安全修改排序方式
|
2024-06-12 14:19:06 +08:00 |
|
|
|
824f08436f
|
人员修改
|
2024-06-12 10:38:52 +08:00 |
|
|
|
4f89f0254d
|
修改bug
|
2024-06-12 09:06:27 +08:00 |
|
|
|
f6053aa743
|
人员修改
|
2024-06-11 23:38:58 +08:00 |
|
|
|
7b38ec38e4
|
特殊作业修改
|
2024-06-11 19:38:45 +08:00 |
|
|
|
cd1a93e6b8
|
修改bug
|
2024-06-11 16:18:30 +08:00 |
|
|
|
2e43ee55a4
|
修改bug
|
2024-06-11 15:26:26 +08:00 |
|
|
|
4281929c0a
|
海康状态修改
|
2024-06-11 14:47:06 +08:00 |
|
|
|
aadbcb74f3
|
下发状态修改
|
2024-06-11 10:22:58 +08:00 |
|
|
|
d177acd242
|
人员同步失败处理
|
2024-06-08 22:00:16 +08:00 |
|
|
|
bca18576bf
|
企业修改
|
2024-06-07 23:15:45 +08:00 |
|
|
|
4da9fa295b
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-07 23:14:52 +08:00 |
|
|
|
aa82cd85ca
|
车辆修改
|
2024-06-07 20:25:28 +08:00 |
|
|
|
a746385473
|
IP地址替换
|
2024-06-07 19:46:04 +08:00 |
|
|
|
70f079834e
|
修复
|
2024-06-07 17:44:21 +08:00 |
|
|
|
8e1aa06145
|
移动方法
|
2024-06-07 16:51:37 +08:00 |
|
|
|
3caec4f5c2
|
移动方法
|
2024-06-07 16:40:55 +08:00 |
|
|
|
a32d4d5caf
|
bug修改
|
2024-06-07 16:30:12 +08:00 |
|
|
|
6b3aacbbdf
|
星纵配置
|
2024-06-07 15:52:17 +08:00 |
|
|
|
b13c0a727c
|
bug修复
|
2024-06-07 14:39:48 +08:00 |
|
|
|
738ce5867c
|
bug修改
|
2024-06-07 11:35:27 +08:00 |
|
|
|
782bd13681
|
回退--->人员组织删除判断工作流存在信息
|
2024-06-07 09:14:03 +08:00 |
|
|
|
c95300cd5c
|
日志
|
2024-06-06 23:21:11 +08:00 |
|
|
|
95c0ddb8d5
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-06 21:49:32 +08:00 |
|
|
|
f70c020d52
|
bug修改
|
2024-06-06 21:15:22 +08:00 |
|
|
|
2e220a9fcb
|
调用bug修改
|
2024-06-06 21:13:17 +08:00 |
|
|
|
4eb0efd056
|
人员组织删除判断工作流存在信息
|
2024-06-06 19:22:58 +08:00 |
|
|
|
183665b000
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-06 17:53:44 +08:00 |
|
|
|
b0e74517df
|
调用海康bug修改
|
2024-06-06 17:21:47 +08:00 |
|
|
|
cb96592eb5
|
导入人员安全教育档案
|
2024-06-06 16:05:18 +08:00 |
|
|
|
a0445656e8
|
安全履职报警
|
2024-06-06 15:02:05 +08:00 |
|
|
|
4a8a00cfdc
|
安全履职报警
|
2024-06-06 14:59:53 +08:00 |
|
|
|
7f8a821e1e
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-06 09:32:09 +08:00 |
|
|
|
2938a8624a
|
Merge branch 'guoshengxiongtemp' into guoshengxiong
|
2024-06-06 09:30:14 +08:00 |
|
|
|
4d9aefc10c
|
Merge branch 'guoshengxiongtemp' into guoshengxiong
|
2024-06-06 09:05:24 +08:00 |
|
|
|
b99469554c
|
Merge branch 'guoshengxiong' into guoshengxiongtemp
|
2024-06-05 22:50:19 +08:00 |
|
|
|
5138c20caf
|
bug修改
|
2024-06-05 22:47:33 +08:00 |
|
