122 Commits (c4730709b2864cdd1007a16231928afc1bd85e04)

Author	SHA1	Message	Date
fangjiakai	8c5051aaaf	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java # src/main/java/com/zcloud/service/eightwork/HotworkService.java # src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java # src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml	2024-01-19 10:26:55 +08:00
fangjiakai	d4e586d700	动火作业 service层方法	2024-01-19 10:23:06 +08:00
xiepeng	5d35ba69d8	动火作业 根据Id查询 ... 八项作业保存删除图片	2024-01-19 09:23:41 +08:00
chenxinying	2f1ef51627	动火气体检测分析的创建	2024-01-18 16:43:05 +08:00
fangjiakai	fb0f7cf1fe	动火作业	2024-01-18 08:55:39 +08:00
fangjiakai	c3a95c61c0	动火作业	2024-01-17 13:41:44 +08:00
chenxinying	20fdf49bbc	八项作业删除	2024-01-17 10:43:13 +08:00
chenxinying	eda0a53e19	八项作业作废时，监控删除，视频监控列表	2024-01-16 15:14:42 +08:00
chenxinying	0fce9d9f9a	Merge remote-tracking branch 'origin/dev' into dev	2024-01-15 17:19:50 +08:00
WenShiJun	500456a892	PLSUtil工具类新增部分三方接口及封装方法，恢复切换分支后之前优化的bug代码被覆盖的部分代码	2024-01-12 16:40:52 +08:00
chenxinying	e43d380e01	Merge remote-tracking branch 'origin/dev' into dev	2024-01-11 17:18:28 +08:00
fangjiakai	0b01e507c9	修改MQ消息发送	2024-01-11 17:18:06 +08:00
chenxinying	d230d3e62a	Merge remote-tracking branch 'origin/dev' into dev	2024-01-11 17:04:36 +08:00
chenxinying	09f069e1ac	八项作业添加监控	2024-01-11 16:58:12 +08:00
WenShiJun	26a757a44c	UsersController层中逻辑迁移至UsersServiceImpl，并新增调用远程新增接口	2024-01-11 15:17:27 +08:00
chenxinying	9c86394e0b	企业人员定位系统参数表	2024-01-10 17:37:12 +08:00
fangjiakai	da7145a1a1	整合other mq	2024-01-05 10:06:26 +08:00
fangjiakai	c40f40d58d	整合other mq	2024-01-05 09:57:31 +08:00
fangjiakai	0afe99435e	整合other mq	2024-01-05 08:51:44 +08:00
fangjiakai	9c60c0103a	整合education	2024-01-04 10:07:06 +08:00
fangjiakai	3486386421	整合prevention	2024-01-04 09:07:20 +08:00
fangjiakai	ae68bbf464	整合system	2024-01-03 11:04:18 +08:00