 liujun
|
7cdaacec8c
|
企业端、股份端，相关方人员详情信息代码同步
|
2024-01-30 13:49:14 +08:00 |
|
liujun
|
e4dccddf68
|
相关方流程记录功能开发
|
2024-01-30 12:03:01 +08:00 |
|
liujun
|
48a42cd173
|
1、错别字更改
2、监管端查询sql报错修改
3、表单提交后未清空。
|
2024-01-29 17:20:49 +08:00 |
|
liujun
|
9db1215e25
|
审批过程中审批意见丢失bug修改
|
2024-01-29 14:51:43 +08:00 |
|
liujun
|
00d78e12aa
|
代码格式话
|
2024-01-29 14:04:25 +08:00 |
|
liujun
|
2d6bbf03d7
|
1、流程数据保存错误bug修改
2、打回后无法审批bug修复
|
2024-01-29 13:20:28 +08:00 |
|
liujun
|
0f331c3972
|
13862 选择第二个审批 报错
|
2024-01-27 15:57:51 +08:00 |
zhaoyu
|
c2a535e105
|
增加排序
|
2024-01-26 14:06:54 +08:00 |
|
liujun
|
9ea2651ed9
|
相关方人员无法打回bug修复
|
2024-01-25 19:14:28 +08:00 |
|
zhaoyu
|
faed220f73
|
搜索问题处理 视频看不了问题处理
|
2024-01-25 17:40:54 +08:00 |
|
liujun
|
6ba0eb1cdd
|
dev测试环境配置更正
|
2024-01-25 14:49:42 +08:00 |
guoyuepeng
|
391cd08b45
|
Merge remote-tracking branch 'origin/2024-01-16-zy-门口门禁需求' into 2024年1月24日测试
# Conflicts:
# src/main/resources/application-dev.properties
# src/main/resources/application.properties
|
2024-01-25 09:59:58 +08:00 |
|
zhaoyu
|
f85199b58c
|
错误提示问题
|
2024-01-24 16:32:13 +08:00 |
 guoyuepeng
|
0a8b2521ff
|
Merge pull request 'liujun-2024-01-17-相关方新需求' (#12) from liujun-2024-01-17-相关方新需求 into 2024年1月24日测试
Reviewed-on: #12
|
2024-01-24 15:54:30 +08:00 |
|
guoyuepeng
|
b6ab0be249
|
Merge pull request '消防器材功能迁移至企业端' (#11) from liujun-2024-01-09-消防功能新需求 into 2024年1月24日测试
Reviewed-on: #11
|
2024-01-24 15:53:46 +08:00 |
|
zhaoyu
|
fd28a121da
|
相邻区域问题修复
|
2024-01-24 15:43:20 +08:00 |
|
liujun
|
a79a9292a2
|
消防器材功能迁移至企业端
|
2024-01-24 11:43:42 +08:00 |
|
zhaoyu
|
7cade78064
|
增加绑定摄像头
|
2024-01-23 18:55:14 +08:00 |
|
zhaoyu
|
fc979979d0
|
门口门禁增加摄像头功能
|
2024-01-23 17:37:28 +08:00 |
|
liujun
|
0cd60ce5e3
|
若干bug修改
|
2024-01-23 15:38:30 +08:00 |
|
zhaoyu
|
b7c071980e
|
企业端门口门禁开发完成并且人员信息增加门口门禁卡号字段完成
|
2024-01-23 14:24:08 +08:00 |
|
liujun
|
a52ccd1f50
|
若干bug修改
|
2024-01-22 19:32:40 +08:00 |
|
liujun
|
7f3007041e
|
若干bug修改
|
2024-01-22 18:47:25 +08:00 |
|
liujun
|
bacf047b67
|
若干bug修改
|
2024-01-22 18:21:41 +08:00 |
|
liujun
|
f7dd131d82
|
若干bug修改
|
2024-01-22 18:11:55 +08:00 |
|
liujun
|
e673955258
|
若干bug修改
|
2024-01-22 15:23:03 +08:00 |
|
liujun
|
eebf95ff9e
|
若干bug修改
|
2024-01-22 14:39:39 +08:00 |
|
zhaoyu
|
332f52244c
|
门口门禁处理
|
2024-01-21 17:37:50 +08:00 |
|
liujun
|
d3b41ecf7b
|
去除debugger
|
2024-01-19 20:44:33 +08:00 |
|
liujun
|
7d015ec138
|
若干bug修复
|
2024-01-19 18:35:26 +08:00 |
|
guoyuepeng
|
a88e165a08
|
2024年1月19日V01.00.51
|
2024-01-19 17:45:39 +08:00 |
|
liujun
|
0bfd1d1d9d
|
功能重构
|
2024-01-19 16:45:45 +08:00 |
|
liujun
|
b393a6164a
|
相关放功能流程调整
|
2024-01-19 16:11:49 +08:00 |
|
zhaoyu
|
a401af0608
|
Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日
|
2024-01-18 21:11:57 +08:00 |
|
zhaoyu
|
fa734f9c00
|
过滤责任状
|
2024-01-18 21:11:49 +08:00 |
|
liujun
|
a992cea275
|
一般隐患台账-按列导出bug修复
|
2024-01-18 20:25:27 +08:00 |
|
liujun
|
faa5668678
|
Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日
|
2024-01-18 19:38:34 +08:00 |
|
zhaoyu
|
eb56a0894c
|
提交
|
2024-01-18 19:36:33 +08:00 |
|
liujun
|
bdadc00015
|
垃圾文件删除
|
2024-01-18 19:36:33 +08:00 |
|
zhaoyu
|
0aec1ad946
|
企业端推送沧州矿石
|
2024-01-18 16:29:47 +08:00 |
|
zhaoyu
|
7a721799b7
|
门口门禁进出记录
|
2024-01-18 16:26:59 +08:00 |
|
liujun
|
1cf1adefd9
|
相关方流程变更
|
2024-01-18 13:56:15 +08:00 |
|
liujun
|
6193cf4c03
|
相关方流程变更
|
2024-01-17 18:43:03 +08:00 |
|
zhaoyu
|
5e9aaf7bdd
|
门口门禁开发
|
2024-01-17 14:46:28 +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 |
|
zhaoyu
|
e14165e4cc
|
动火作业时间不对bug修复
|
2024-01-09 16:40:03 +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 |
|
liujun
|
4be8922c59
|
相关方端bug
|
2024-01-02 14:12:40 +08:00 |
|
zhaoyu
|
e2dc13b349
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 16:45:36 +08:00 |
|
zhaoyu
|
18b1a824b4
|
对接到沧州矿石
|
2023-12-28 16:45:28 +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 |
|
zhaoyu
|
7b9d086d55
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-27 11:12:59 +08:00 |
|
zhaoyu
|
4574316eee
|
处理海康空指针问题
|
2023-12-27 11:12:51 +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
|
c346cd9d4e
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:57:09 +08:00 |
|
zhaoyu
|
91c3ebdcfc
|
图片地址
|
2023-12-26 16:56:49 +08:00 |
limingyu
|
5bf53a82a6
|
修改pc端动火作业动火区域管辖单位显示bug
|
2023-12-26 16:42:56 +08:00 |
|
guoyuepeng
|
0a7cacc666
|
测试环境和正式环境的配置信息,
|
2023-12-26 16:21:52 +08:00 |
|
zhaoyu
|
d05156eee2
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:11:36 +08:00 |
|
zhaoyu
|
42ea8d5208
|
高处作业迁移补充
|
2023-12-26 16:11:26 +08:00 |
|
guoyuepeng
|
ee37e8e021
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 14:02:28 +08:00 |
|
liujun
|
a8378f01f0
|
Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移
|
2023-12-26 13:45:38 +08:00 |
|
liujun
|
e1cd46b493
|
bug修复
|
2023-12-26 12:35:28 +08:00 |
|
guoyuepeng
|
021a6551a3
|
动态地址的默认信息
|
2023-12-26 11:48:51 +08:00 |
|
guoyuepeng
|
7a85418098
|
Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
|
2023-12-26 09:54:14 +08:00 |
|
liujun
|
797a8c0586
|
bug修复
|
2023-12-25 18:17:09 +08:00 |
|
liujun
|
4f60d4f571
|
解决无法多选bug
|
2023-12-25 14:45:17 +08:00 |
|
limingyu
|
c8e4eb4972
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 14:13:48 +08:00 |
|
limingyu
|
72793b2a76
|
Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移
# Conflicts:
# src/main/java/com/zcloud/controller/system/LoginController.java
|
2023-12-25 13:58:14 +08:00 |
|
zhaoyu
|
c82b1a7a01
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 13:55:33 +08:00 |
|
zhaoyu
|
ce4aafb5af
|
Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移
|
2023-12-25 13:55:16 +08:00 |
|
dearlin
|
46b4239571
|
add: app用户登录时候后台地址问题
|
2023-12-23 11:36:32 +08:00 |
|
liujun
|
40cbbe7dcc
|
查看bug修复
|
2023-12-23 10:27:04 +08:00 |
|
liujun
|
8be39e14d3
|
查看bug修复
|
2023-12-22 17:41:36 +08:00 |
|
zhaoyu
|
0e22d45975
|
增加坐标
|
2023-12-22 17:09:54 +08:00 |
|
liujun
|
93679092de
|
查看bug修复
|
2023-12-22 17:07:44 +08:00 |
|
liujun
|
5d46fa3c4d
|
查看bug修复
|
2023-12-22 15:49:12 +08:00 |
|
liujun
|
cd048126c0
|
查看bug修复
|
2023-12-22 13:39:11 +08:00 |
|
zhaoyu
|
195b9d4de0
|
处理数据丢失问题
|
2023-12-22 09:22:58 +08:00 |
|
liujun
|
644ee59398
|
查看bug修复
|
2023-12-21 19:55:08 +08:00 |
|
zhaoyu
|
519c0be3e7
|
注释代码
|
2023-12-21 17:46:03 +08:00 |
|
liujun
|
f59d2b0500
|
查看bug修复
|
2023-12-21 16:59:50 +08:00 |
|
liujun
|
e552502458
|
查看bug修复
|
2023-12-21 15:15:45 +08:00 |
|
liujun
|
a28d97cea7
|
相关方查看详情统一格式
|
2023-12-21 13:58:57 +08:00 |
|
liujun
|
9e7a5334bd
|
bug修复
|
2023-12-20 19:51:15 +08:00 |
|
liujun
|
8c68daee79
|
bug修复
|
2023-12-20 15:57:29 +08:00 |
|
liujun
|
add025a274
|
bug修复
|
2023-12-20 15:01:47 +08:00 |
|
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +08:00 |
|
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
|
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
|
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |
|
liujun
|
a87827104e
|
Merge branch 'dev' into 1212-八项作业迁移
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
|
2023-12-19 16:45:15 +08:00 |
|
liujun
|
d5f729cdbe
|
bug修复
|
2023-12-19 15:01:44 +08:00 |
|
limingyu
|
e29300756e
|
Merge branch 'dev' into lmy20231215-动火bug修改
|
2023-12-19 14:15:35 +08:00 |
|
zhaoyu
|
07b7e772aa
|
列表拆分 并且app播放视频
|
2023-12-19 11:33:21 +08:00 |
|
liujun
|
6d49773242
|
相关方需求变革
|
2023-12-18 20:24:02 +08:00 |
|
liujun
|
cfb4c2dd8e
|
相关方需求变革
|
2023-12-18 19:58:52 +08:00 |
|
liujun
|
a0dcdb61d3
|
相关方需求变革
|
2023-12-18 18:54:50 +08:00 |
|
zhaoyu
|
63d831eba9
|
增加角标
|
2023-12-18 14:23:18 +08:00 |
|
zhaoyu
|
d59a9f1dfe
|
重点工程列表排序
|
2023-12-18 10:25:17 +08:00 |
|
zhaoyu
|
6cb9900bbf
|
增加31的mq配置
|
2023-12-18 09:36:47 +08:00 |
|
zhaoyu
|
0d9228dda4
|
八项作业优化 正向流程bug修复
|
2023-12-17 15:53:55 +08:00 |
|
zhaoyu
|
343b66b914
|
正向逻辑走通
|
2023-12-17 14:18:12 +08:00 |
|
zhaoyu
|
fcd6a6860f
|
高处作业迁移补充
|
2023-12-17 09:31:34 +08:00 |
|
limingyu
|
6997c26a5f
|
一公司企业端驾驶舱危险作业统计显示2
|
2023-12-15 15:09:16 +08:00 |
|
limingyu
|
83c43d21f2
|
Merge branch 'lmy20231207-登录返回图片和后端地址' into lmy20231215-动火bug修改
|
2023-12-15 14:11:14 +08:00 |
|
limingyu
|
4a347f328a
|
Merge branch 'lmy20231211' into lmy20231215-动火bug修改
|
2023-12-15 14:05:10 +08:00 |
|
limingyu
|
6937054d44
|
一公司企业端驾驶舱危险作业统计显示
|
2023-12-15 13:59:11 +08:00 |
|
zhaoyu
|
1cb56a5c82
|
正式配置修改
|
2023-12-14 19:42:21 +08:00 |
|
zhaoyu
|
a63fd74460
|
Merge remote-tracking branch 'origin/lmy20231113' into 相关方关联分公司功能
|
2023-12-14 19:33:34 +08:00 |
|
guoyuepeng
|
88be88ad31
|
正式地址配置信息
|
2023-12-14 19:32:32 +08:00 |
|
zhaoyu
|
c972e6c9c7
|
Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能
|
2023-12-14 18:48:24 +08:00 |
|
limingyu
|
f53539025c
|
延时监火改为多人同时监火，在同一个部门中都可以查看和发布监火信息2
|
2023-12-14 18:40:07 +08:00 |
|
zhaoyu
|
190f0dc838
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-14 17:23:51 +08:00 |
|
zhaoyu
|
8446811b6f
|
搜索bug处理
|
2023-12-14 17:23:42 +08:00 |
|
liujun
|
71e3449f48
|
12618 编辑页面 判空提示语不正确
|
2023-12-14 16:50:11 +08:00 |
|
liujun
|
09b8516881
|
八项作业前端更新
|
2023-12-14 14:47:02 +08:00 |
|
zhaoyu
|
253f559ba5
|
是否发送短信字段
|
2023-12-14 09:52:05 +08:00 |
|
zhaoyu
|
9469e9c1db
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-13 14:45:23 +08:00 |
|
zhaoyu
|
cfc13f4ae0
|
企业端缺失功能补全
|
2023-12-13 14:45:11 +08:00 |
|
liujun
|
d55fd86916
|
八项作业前端更新
|
2023-12-13 14:35:16 +08:00 |
|
liujun
|
e3b7a14601
|
吊装作业
|
2023-12-13 13:49:37 +08:00 |
|
liujun
|
e21a116d8d
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 13:02:45 +08:00 |
|
liujun
|
8e983a58a8
|
短路功能迁移
|
2023-12-13 13:02:20 +08:00 |
|
zhaoyu
|
dfa04334c3
|
临时用电迁移
|
2023-12-13 10:58:39 +08:00 |
|
liujun
|
515476f56a
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 10:14:20 +08:00 |
|
liujun
|
520d5a03c6
|
短路功能迁移
|
2023-12-13 10:14:00 +08:00 |
|
zhaoyu
|
7f3883c401
|
临时用电 暂时提交 报错未解决
|
2023-12-13 09:18:54 +08:00 |
|
liujun
|
c998e2ebb0
|
bug修复
|
2023-12-12 19:16:04 +08:00 |
|
liujun
|
cce02a4d42
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-12 18:02:47 +08:00 |
|
liujun
|
1daf485e92
|
八项作业mq功能
|
2023-12-12 18:02:22 +08:00 |
|
zhaoyu
|
e9fccd58fc
|
有限空间迁移 还缺少mq 等内容
|
2023-12-12 17:47:59 +08:00 |
|
zhaoyu
|
f338b750da
|
动土作业迁移
|
2023-12-12 15:25:59 +08:00 |
|
zhaoyu
|
486a95acdb
|
盲板作业迁移
|
2023-12-12 13:46:12 +08:00 |
|
zhaoyu
|
2521ccf737
|
部署31专用配置文件
|
2023-12-12 10:24:05 +08:00 |
|
zhaoyu
|
e0d63a1bcb
|
部署31配置文件修改
|
2023-12-12 10:23:44 +08:00 |
|
zhaoyu
|
25bcb42ad0
|
Merge branch '1122-动火台账' into 相关方关联分公司功能
|
2023-12-11 17:59:10 +08:00 |
|
zhaoyu
|
07cdd9faa4
|
Merge branch '安全环保检查状态改8-1122' into 相关方关联分公司功能
|
2023-12-11 17:59:07 +08:00 |
|
zhaoyu
|
dfcc0cb817
|
Merge remote-tracking branch 'origin/liujun-2023-12-05-相关方需求变更' into 相关方关联分公司功能
|
2023-12-11 17:59:02 +08:00 |
|
zhaoyu
|
bbc8ea9a54
|
Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能
|
2023-12-11 17:58:17 +08:00 |
|
limingyu
|
98dc83e051
|
延时监火改为多人同时监火，在同一个部门中都可以查看和发布监火信息
|
2023-12-11 10:00:16 +08:00 |