Commit Graph

20 Commits (918037d593e0350aa08ef4f8e505b2077d964e0d)

Author SHA1 Message Date
dearlin 19021b8999 安全例会 2024-02-20 16:10:49 +08:00
dearlin 09a83d789e 安全例会 2024-02-06 15:40:01 +08:00
fangjiakai 2d1952b93f Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:15:09 +08:00
fangjiakai eea6621946 地图八项作业 2024-02-04 09:14:57 +08:00
zhangqihang 05927c3048 重点工程 2024-02-03 17:53:40 +08:00
dearlin 7d60a3c2cd 根据卡号查询人员信息 2024-01-29 09:07:29 +08:00
dearlin 5032c3e5c1 ai报警,人员信息导入的时候卡号变成5位 2024-01-26 15:54:26 +08:00
dearlin cf1573cbaa 手机端排查未在电子围栏禁止排查 2024-01-25 17:24:05 +08:00
dearlin 648d5df8e7 根据定位卡号获取人是否再电子围栏里,shiro权限注释 2024-01-25 16:37:20 +08:00
dearlin 84b0151796 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:20:40 +08:00
dearlin 8187112f9a 绑定人员定位卡号 2024-01-25 14:20:05 +08:00
wangpeng 9d93529c50 权限路由 2024-01-24 11:39:18 +08:00
WenShiJun f628f098b3 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev
# Conflicts:
#	src/main/java/com/zcloud/service/system/DepartmentService.java
2024-01-22 14:17:42 +08:00
WenShiJun 5c15b857f3 新增安全、环保检查管理模块 2024-01-22 14:15:49 +08:00
xiepeng 5d35ba69d8 动火作业 根据Id查询
八项作业保存删除图片
2024-01-19 09:23:41 +08:00
WenShiJun 26a757a44c UsersController层中逻辑迁移至UsersServiceImpl,并新增调用远程新增接口 2024-01-11 15:17:27 +08:00
fangjiakai da7145a1a1 整合other mq 2024-01-05 10:06:26 +08:00
fangjiakai 0afe99435e 整合other mq 2024-01-05 08:51:44 +08:00
fangjiakai 3486386421 整合prevention 2024-01-04 09:07:20 +08:00
fangjiakai ae68bbf464 整合system 2024-01-03 11:04:18 +08:00