liulixin
|
cfcd363e36
|
闸机出入记录功能
|
2024-01-23 18:05:30 +08:00 |
|
liulixin
|
63cc479f4f
|
门口门禁记录
|
2024-01-19 16:56:47 +08:00 |
|
liulixin
|
34f27ebfd4
|
门口门禁记录
|
2024-01-19 15:39:45 +08:00 |
 dearlin
|
d92c164b15
|
地图上展示八项作业相关
|
2024-01-19 08:53:29 +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
|
5678f4451d
|
八项作业不显示扎点
|
2024-01-18 15:11:33 +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 |
zhaoyu
|
1539163515
|
增加隐患数量
|
2024-01-11 18:02:12 +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 |
|
liulixin
|
91f52699d4
|
add-log mq-日志记录
|
2024-01-10 16:53:30 +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 |
|
dearlin
|
e27862fe53
|
门禁闸机地图对接
|
2024-01-09 16:01:16 +08:00 |
|
dearlin
|
d4d4de3185
|
平台视频，电子围栏，围栏报警。
|
2024-01-08 14:55:15 +08:00 |
|
dearlin
|
3fe3d5e010
|
人员定位
|
2024-01-08 09:16:25 +08:00 |
|
dearlin
|
6fef2c1407
|
沧州矿石数据同步日志
|
2024-01-06 15:24:03 +08:00 |
|
dearlin
|
12d0079c3b
|
缺少的文件
|
2024-01-06 10:52:36 +08:00 |
limingyu
|
9d8d1d4f7a
|
八项作业对接问题修改1
|
2024-01-05 15:12:26 +08:00 |
|
1261008090@qq.com
|
df3c2fa9ee
|
人员定位
|
2024-01-05 14:14:52 +08:00 |
|
liujun
|
4be8922c59
|
相关方端bug
|
2024-01-02 14:12:40 +08:00 |
 songwenxuan
|
059e5aaa1d
|
对接代码dockData补充
|
2023-12-29 12:01:13 +08:00 |
|
dearlin
|
cb54c67d4e
|
重点工程流程完善
|
2023-12-29 11:05:41 +08:00 |
|
dearlin
|
0e778fd1d9
|
fix:使用的库不准确的问题
|
2023-12-28 21:34:59 +08:00 |
|
dearlin
|
b2733dd3d1
|
add:合并线上代码
|
2023-12-28 20:03:02 +08:00 |
|
dearlin
|
d5530c6ee6
|
add:重点工程数据同步
|
2023-12-28 19:51:22 +08:00 |
|
dearlin
|
a7f6193998
|
add:重点工程数据同步
|
2023-12-28 19:33:26 +08:00 |
|
dearlin
|
3a66270a6f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 14:07:10 +08:00 |
|
dearlin
|
cb3db28e83
|
add：数据同步配置文件
|
2023-12-28 14:06:55 +08:00 |
|
liujun
|
a2caf30b90
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.properties
# src/main/resources/application-local.properties
# src/main/resources/application-master.properties
|
2023-12-28 13:53:41 +08:00 |
|
dearlin
|
fa82dc7272
|
add：港务局数据同步注解与配置
|
2023-12-28 13:49:21 +08:00 |
|
dearlin
|
19181555b8
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
# Conflicts:
# src/main/resources/application-dev.properties
|
2023-12-27 10:22:30 +08:00 |
|
dearlin
|
6a7ec92c75
|
fix: app用户登录时候后台地址问题
|
2023-12-27 10:21:55 +08:00 |
guoyuepeng
|
86765ce3c7
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 17:26:51 +08:00 |
|
zhaoyu
|
91c3ebdcfc
|
图片地址
|
2023-12-26 16:56:49 +08:00 |
|
guoyuepeng
|
0a7cacc666
|
测试环境和正式环境的配置信息,
|
2023-12-26 16:21:52 +08:00 |