water_xu
|
31fda57c0d
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-07-05 16:18:37 +08:00 |
|
water_xu
|
32f94d9cf1
|
安全环保检查 - App端的安全环保检查确认时的空指针bug修复
|
2024-07-05 16:18:28 +08:00 |
 guoyuepeng
|
b8480d2457
|
Merge pull request 'pet' (#22) from pet into dev
Reviewed-on: #22
|
2024-07-02 17:00:51 +08:00 |
guoyuepeng
|
2fe234defa
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-07-02 16:59:36 +08:00 |
|
guoyuepeng
|
15f1a8240d
|
Merge branch 'dev' into pet
|
2024-07-02 16:59:15 +08:00 |
|
water_xu
|
875f37ee50
|
工匠学院 - 推送人员数据时补全img路径前缀
|
2024-07-02 16:05:30 +08:00 |
 liujun
|
98d303bc66
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-07-02 15:15:11 +08:00 |
|
liujun
|
eba8aec968
|
Merge branch 'liujun-2024-06-06-相关方新需求' into pet
# Conflicts:
# src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
# src/main/resources/application-local.properties
|
2024-07-02 14:57:55 +08:00 |
|
liujun
|
c8a22f8189
|
一公司边界入侵企业端代码未与监管端代码统一问题修复
|
2024-06-28 22:21:30 +08:00 |
|
liujun
|
3dbcce216d
|
一公司边界入侵企业端与监管端代码未同步
|
2024-06-28 21:56:47 +08:00 |
|
liujun
|
d358ab3508
|
定位系统url更正
|
2024-06-28 19:03:46 +08:00 |
|
liujun
|
ec119c49d7
|
监管端工匠学员信息bug修复
|
2024-06-28 15:14:29 +08:00 |
|
liujun
|
a6f40ada38
|
Merge branch 'pet' into liujun-2024-06-20-工匠学员对接
|
2024-06-28 11:19:04 +08:00 |
|
liujun
|
8f5bbae950
|
Merge branch 'pet' into liujun-2024-06-13-一公司人员定位新需求
|
2024-06-27 17:31:14 +08:00 |
|
water_xu
|
1979dfdb63
|
用户推送数据结构-userList变为数组
|
2024-06-27 17:28:24 +08:00 |
|
water_xu
|
899aac4cbd
|
公钥等属性注入去掉static修饰
|
2024-06-27 17:03:08 +08:00 |
|
liujun
|
f83f0ff3ee
|
学院定位
|
2024-06-27 15:59:25 +08:00 |
|
liujun
|
9d52c53c8d
|
边界入侵未初始化bug修复
|
2024-06-27 15:15:14 +08:00 |
|
guoyuepeng
|
abe20ba360
|
Merge pull request '626相关方人员数据对接' (#21) from 626相关方人员数据对接 into pet
Reviewed-on: #21
|
2024-06-27 14:48:20 +08:00 |
|
liujun
|
9a1ea011e3
|
边界入侵，企业端代码
|
2024-06-27 13:18:49 +08:00 |
|
liujun
|
213d2fa16f
|
工匠学院人员对接功能完善
|
2024-06-26 14:23:31 +08:00 |
 songwenxuan
|
6b90c0f662
|
626相关方人员数据对接
|
2024-06-26 14:00:18 +08:00 |
|
water_xu
|
d41cea6aeb
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-06-25 17:18:24 +08:00 |
|
water_xu
|
8e38720262
|
bug-15522 隐患处罚管理 不显示ai报警的隐患
|
2024-06-25 17:18:16 +08:00 |
|
liujun
|
9422e6958c
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-24 08:50:46 +08:00 |
WenShiJun
|
62ece3f434
|
动火作业新增接口所有节点打回时添加保存签字图片和打回意见逻辑
|
2024-06-21 17:40:50 +08:00 |
|
liujun
|
064b6bdc33
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-06-20 16:45:39 +08:00 |
|
liujun
|
6d9a283acc
|
错误代码回滚
|
2024-06-20 16:14:51 +08:00 |
|
liujun
|
c5f5081596
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-20 14:36:01 +08:00 |
|
WenShiJun
|
e1033f8a41
|
接受交底人和完工验收多图片上传逻辑修改
|
2024-06-20 14:02:01 +08:00 |
|
liujun
|
d8113d56e6
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-20 08:35:48 +08:00 |
|
WenShiJun
|
3cc4a13ad3
|
接受交底人，完工验收添加多张签字图片逻辑修改，新增saveFiles方法
新增动火操作人图片删除方法
|
2024-06-19 17:25:57 +08:00 |
|
liujun
|
742295fd29
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-06-18 19:39:32 +08:00 |
|
liujun
|
22b0f9233d
|
隐患库、标准库功能模块
|
2024-06-18 19:35:20 +08:00 |
|
liujun
|
84a38ed58f
|
隐患库、标准库功能模块
|
2024-06-18 19:32:45 +08:00 |
|
water_xu
|
e314ab4850
|
合并分支
|
2024-06-18 17:44:23 +08:00 |
|
water_xu
|
49edb5fddc
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-06-18 17:42:55 +08:00 |
|
liujun
|
a600897c34
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-18 08:37:11 +08:00 |
|
WenShiJun
|
3e9f75af65
|
安全防护措施动态插入数据
|
2024-06-17 17:49:52 +08:00 |
|
WenShiJun
|
9d1e796ec7
|
动火app详情页面响应数据添加字段
|
2024-06-17 10:23:18 +08:00 |
|
WenShiJun
|
4c9929452e
|
如果是暂存数据在其他节点不显示
完工验收如果不输入意见默认同意
补充项目责任负责人签字图片
|
2024-06-14 17:52:50 +08:00 |
|
liujun
|
30287687a3
|
打回功能
|
2024-06-13 18:42:47 +08:00 |
|
WenShiJun
|
eb9be8ce5f
|
动火页面统计数逻辑修改
安全检查项意见逻辑修改
|
2024-06-13 18:07:27 +08:00 |
|
liujun
|
82a173a6f3
|
1、边界入侵界面更新
2、边界入侵摄像头标点不显示bug修复
|
2024-06-13 15:01:53 +08:00 |
|
liujun
|
f10cae67a1
|
企业端、监管端功能同步
|
2024-06-12 15:00:08 +08:00 |
|
liujun
|
b8201850a4
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-12 11:43:17 +08:00 |
|
liujun
|
6c0fe2170c
|
相关方人员
|
2024-06-12 11:25:59 +08:00 |
|
liujun
|
246de69195
|
相关方人员信息打回
|
2024-06-12 08:51:18 +08:00 |
|
liujun
|
4d59fba200
|
1、bug修复-系统异常后事务未回滚
2、指定人员打回
|
2024-06-11 17:42:13 +08:00 |
|
WenShiJun
|
c361f8f794
|
修改动火作业流程，未进行安全措施确认不允许监护人，安全交底人和接受交底人签字
|
2024-06-11 16:17:04 +08:00 |