Commit Graph

380 Commits (5a2502a39f0313ba496051d083a747541cf15899)

Author SHA1 Message Date
limingyu 5a2502a39f 重点工程地图视频点位详情显示是否在线 2024-05-07 13:41:36 +08:00
limingyu 40a74e663d 重点工程地图视频点位显示是否在线 2024-05-07 08:39:19 +08:00
liujun f706202c06 到项目负责人时无法气体分析bug修复 2024-04-29 19:18:00 +08:00
liujun 4d0953876c 代码格式化,没用更改任何代码 2024-04-29 19:06:32 +08:00
limingyu a4a85c5171 Merge branch 'pet' into limingyu-20240416-一公司动火作业地图
# Conflicts:
#	src/main/resources/application.properties
2024-04-29 15:14:27 +08:00
water_xu fce988e59e Merge remote-tracking branch 'origin/pet' into pet 2024-04-29 15:10:17 +08:00
water_xu 35980a4789 完善了重点工程隐患评审功能 2024-04-29 09:55:00 +08:00
liujun f93c185fb0 三项制度库新增导入数据区分 2024-04-28 14:30:06 +08:00
limingyu 913f5ce6e2 Merge branch 'dev' into limingyu-20240416-一公司动火作业地图 2024-04-26 17:04:20 +08:00
limingyu 9222ba833b Merge remote-tracking branch 'origin/pet' into pet 2024-04-26 11:34:35 +08:00
limingyu 8727d97312 动火作业详情动火方法不显示 2024-04-26 11:34:22 +08:00
liujun 41f699af68 1、相关方人员头像修改后自动更新企业端头像信息 2024-04-25 17:58:31 +08:00
limingyu 1604612f98 企业端一公司动火作业列表流程图验收时间不显示 2024-04-25 14:42:34 +08:00
liujun 68c9d00ab0 相关方人员审核功能不能委托主账号审核信息 2024-04-25 14:11:30 +08:00
liujun 494bde539f 相关方证书无法更换图片bug 2024-04-24 18:50:21 +08:00
liujun e058e4df8d Merge remote-tracking branch 'origin/pet' into dev
# Conflicts:
#	src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
2024-04-24 17:32:09 +08:00
liujun 1dd6b0fdea Merge remote-tracking branch 'origin/pet' into pet 2024-04-24 17:20:54 +08:00
liujun d4bf9fa523 1、监管端、企业端地图信息更新 2024-04-24 17:20:06 +08:00
limingyu 8733ad32a5 地图摄像头点位不显示 2024-04-24 17:18:52 +08:00
water_xu bef8ce6c91 Merge remote-tracking branch 'origin/pet' into pet 2024-04-24 14:26:45 +08:00
water_xu bafe944e77 增加了安全承诺书日期范围查询功能 2024-04-24 14:16:13 +08:00
liujun 776f133f63 同步时未异步bug修复 2024-04-24 14:02:37 +08:00
liujun 1054f21702 异步功能新增配置 2024-04-23 19:24:33 +08:00
liujun 0a95da31c7 地图新增信息 2024-04-23 18:53:02 +08:00
liujun b5acd5f91d bug修复轨迹不展示 2024-04-23 18:30:39 +08:00
liujun 2b5e24254f Merge remote-tracking branch 'origin/pet' into pet 2024-04-23 17:58:48 +08:00
liujun 672ee48f94 1、企业端接口对接 2024-04-23 17:58:27 +08:00
limingyu 03ac45ffa5 地图摄像头点位不显示 2024-04-23 14:42:00 +08:00
liujun 65bebab413 Merge remote-tracking branch 'origin/pet' into pet 2024-04-23 14:37:08 +08:00
liujun 84080f7498 一公司人员定位功能接口对接功能 2024-04-23 14:36:32 +08:00
guoyuepeng a475cc1df7 Merge remote-tracking branch 'origin/pet' into pet 2024-04-23 09:38:55 +08:00
guoyuepeng e9d80a8016 1.企业端消防点位不显示 2024-04-23 09:38:35 +08:00
limingyu d06fcb8ee6 不显示安全交底人bug 2024-04-22 17:42:38 +08:00
limingyu 30a268e07c Merge branch 'dev' into limingyu-20240416-一公司动火作业地图 2024-04-22 09:24:42 +08:00
water_xu e3b1516b77 增加了安全承诺书日期范围查询功能 2024-04-19 18:41:33 +08:00
water_xu a088c7c173 Merge branch 'dev-water-xu' into dev 2024-04-19 18:07:58 +08:00
liujun 740695321c 系统配置更新 2024-04-19 17:37:52 +08:00
water_xu e49d863bd2 增加了安全承诺书日期范围查询功能 2024-04-19 14:32:40 +08:00
limingyu 2be4c2a38a 关掉消防半月检查表定时器 2024-04-19 13:59:30 +08:00
limingyu ef7510b313 一公司动火作业地图bug修复2 2024-04-19 13:55:44 +08:00
liujun a3f1eb9749 人员类型未显示bug修复 2024-04-18 18:30:15 +08:00
liujun 3dd180d333 一公司地图bug修复 2024-04-17 14:22:06 +08:00
liujun 086632290b 一公司企业端地图功能同步 2024-04-17 11:21:46 +08:00
limingyu 77098bc5fb 一公司动火作业地图bug修复 2024-04-17 10:47:59 +08:00
liujun b93c59b0c9 Merge remote-tracking branch 'origin/liujun-2024-04-12一公司人员定位' into pet 2024-04-17 10:04:42 +08:00
liujun ca299d110d 一公司人员定位地图功能完善 2024-04-17 08:57:44 +08:00
liujun 1da764000c 一公司人员定位地图功能完善 2024-04-16 17:22:44 +08:00
liujun f87f3fdee0 Merge branch 'pet' into dev 2024-04-13 17:30:09 +08:00
liujun ff4be346ff 查询bug修复 2024-04-13 17:11:13 +08:00
liujun e84b612073 完善保存功能 2024-04-13 16:53:00 +08:00