 songwenxuan
|
e42976afc5
|
消防资源管理对接代码
|
2023-12-25 10:29:49 +08:00 |
|
songwenxuan
|
792ee76c9c
|
消防资源管理对接代码
|
2023-12-23 14:05:05 +08:00 |
 dearlin
|
46b4239571
|
add: app用户登录时候后台地址问题
|
2023-12-23 11:36:32 +08:00 |
|
songwenxuan
|
9a06cfa206
|
消防资源管理对接代码
|
2023-12-23 10:49:42 +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 |
z
|
bd49c64ae5
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-22 16:38:02 +08:00 |
|
z
|
d7bf791dfc
|
重点工程部分代码
|
2023-12-22 16:37:33 +08:00 |
|
liujun
|
5d46fa3c4d
|
查看bug修复
|
2023-12-22 15:49:12 +08:00 |
|
liujun
|
cd048126c0
|
查看bug修复
|
2023-12-22 13:39:11 +08:00 |
|
songwenxuan
|
6e813e70ef
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/app/AppImgFilesController.java
|
2023-12-22 10:53:12 +08:00 |
|
zhaoyu
|
195b9d4de0
|
处理数据丢失问题
|
2023-12-22 09:22:58 +08:00 |
|
songwenxuan
|
e5664ae4f3
|
消防资源管理对接代码
|
2023-12-22 09:13:25 +08:00 |
|
dearlin
|
c1431c47db
|
Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
# pom.xml
# src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java
# src/main/java/com/zcloud/service/system/DictionariesService.java
# src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java
# src/main/resources/application-dev.properties
# src/main/resources/application-master.properties
|
2023-12-22 09:12:18 +08:00 |
|
dearlin
|
43edc5ee1e
|
八项作业
|
2023-12-22 09:08:17 +08:00 |
|
songwenxuan
|
61c7075d4c
|
消防安全管理对接代码
|
2023-12-22 08:42:44 +08:00 |
|
songwenxuan
|
4568e46388
|
消防安全管理对接代码
|
2023-12-22 08:42:29 +08:00 |
|
liujun
|
644ee59398
|
查看bug修复
|
2023-12-21 19:55:08 +08:00 |
|
zhaoyu
|
519c0be3e7
|
注释代码
|
2023-12-21 17:46:03 +08:00 |
|
dearlin
|
47a4d549df
|
消防点检app端迁移完成
|
2023-12-21 17:44:17 +08:00 |
|
liujun
|
f59d2b0500
|
查看bug修复
|
2023-12-21 16:59:50 +08:00 |
|
liujun
|
e552502458
|
查看bug修复
|
2023-12-21 15:15:45 +08:00 |
|
songwenxuan
|
3a1fba8604
|
清单排查、隐患流程对接代码
|
2023-12-21 14:32:23 +08:00 |
|
dearlin
|
e4a311fdb2
|
消防资源
|
2023-12-21 14:18:19 +08:00 |
|
liujun
|
a28d97cea7
|
相关方查看详情统一格式
|
2023-12-21 13:58:57 +08:00 |
|
songwenxuan
|
5503a64b6d
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-21 10:05:01 +08:00 |
|
songwenxuan
|
a34a946c0a
|
清单排查、隐患流程对接代码
|
2023-12-21 10:04:48 +08:00 |
|
dearlin
|
15101b57fd
|
图片传输
|
2023-12-21 08:56:30 +08:00 |
|
songwenxuan
|
46d4a3a623
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-21 08:32:05 +08:00 |
|
songwenxuan
|
336916d4b9
|
清单排查、隐患流程对接代码
|
2023-12-21 08:28:37 +08:00 |
|
liujun
|
9e7a5334bd
|
bug修复
|
2023-12-20 19:51:15 +08:00 |
|
z
|
50b21cd9d9
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-20 17:35:38 +08:00 |
|
z
|
bb2381b7b2
|
重点工程部分代码
|
2023-12-20 17:35:26 +08:00 |
|
dearlin
|
1e86cd08b9
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-20 17:16:48 +08:00 |
|
dearlin
|
b05da152b8
|
图片传输
|
2023-12-20 17:16:37 +08:00 |
|
z
|
a64ca447ed
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-20 17:11:09 +08:00 |
|
z
|
65b2c2fa5c
|
重点工程部分代码
|
2023-12-20 17:10:38 +08:00 |
|
liujun
|
8c68daee79
|
bug修复
|
2023-12-20 15:57:29 +08:00 |
limingyu
|
d44ba70a52
|
沧州矿石数据对接有限空间作业
|
2023-12-20 15:25:17 +08:00 |
|
liujun
|
add025a274
|
bug修复
|
2023-12-20 15:01:47 +08:00 |
|
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +08:00 |
|
z
|
ed8f04b79d
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
|
2023-12-20 11:26:18 +08:00 |
|
z
|
491d640c87
|
重点工程部分代码
|
2023-12-20 11:13:51 +08:00 |
|
dearlin
|
60ea9c4d6a
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/aspect/DockingAspect.java
|
2023-12-20 11:08:59 +08:00 |
|
dearlin
|
f0cfa0e9cc
|
数据同步aop改造
|
2023-12-20 11:08:33 +08:00 |
|
z
|
a8b7161202
|
重点工程部分代码
|
2023-12-20 09:18:51 +08:00 |
|
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
|
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
|
z
|
04b47140a9
|
重点工程部分代码
|
2023-12-19 17:59:12 +08:00 |
|
z
|
554cba29f1
|
重点工程部分代码
|
2023-12-19 17:53:04 +08:00 |
|
z
|
88c2a8fdeb
|
重点工程部分代码
|
2023-12-19 17:52:09 +08:00 |
|
z
|
ef780ecd83
|
重点工程部分代码
|
2023-12-19 17:34:17 +08:00 |
|
songwenxuan
|
3b1afc8344
|
清单排查、隐患流程对接代码
|
2023-12-19 17:28:02 +08:00 |
|
z
|
3aa8b0d9af
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-19 17:27:26 +08:00 |
|
z
|
e74db7d77c
|
重点工程部分代码
|
2023-12-19 17:27:01 +08:00 |
|
dearlin
|
9843400cb3
|
合并线上代码
|
2023-12-19 17:24:27 +08:00 |
|
dearlin
|
7ca4ab9570
|
Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
# src/main/resources/application-master.properties
|
2023-12-19 17:18:35 +08:00 |
|
z
|
745db61979
|
重点工程部分代码
|
2023-12-19 17:16:00 +08:00 |
|
dearlin
|
ab8937ed18
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-19 17:14:28 +08:00 |
|
dearlin
|
b0b3c1b2eb
|
库名不对
|
2023-12-19 17:14:02 +08:00 |
|
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |
|
z
|
45da519a19
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-19 17:07:24 +08:00 |
|
z
|
0679647cfd
|
重点工程部分代码
|
2023-12-19 17:06:28 +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 |
|
dearlin
|
ac77a1bbff
|
Merge branch 'czks1.0' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj into guoyuepeng-czks1.0
|
2023-12-19 15:57:27 +08:00 |
|
dearlin
|
fbc6be15c1
|
企业系统管理
|
2023-12-19 15:55:25 +08:00 |
|
dearlin
|
54dffe99ab
|
合并重点工程
|
2023-12-19 15:46:18 +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 |
|
dearlin
|
b05a521997
|
企业系统管理
|
2023-12-19 11:33:26 +08:00 |
|
zhaoyu
|
07b7e772aa
|
列表拆分 并且app播放视频
|
2023-12-19 11:33:21 +08:00 |
|
dearlin
|
97a5df06f6
|
Merge remote-tracking branch 'origin/corpSystem' into czks1.0
# Conflicts:
# src/main/resources/application-dev.properties
|
2023-12-19 11:20:23 +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 |
|
limingyu
|
f291775fd1
|
APP不获取用户信息
|
2023-12-18 18:17:51 +08:00 |
|
songwenxuan
|
6de19888a1
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-18 16:58:26 +08:00 |
|
songwenxuan
|
ca39da851b
|
代码恢复
|
2023-12-18 16:58:08 +08:00 |
|
dearlin
|
062f77fa00
|
附件上传
|
2023-12-18 16:14:27 +08:00 |
|
zhaoyu
|
63d831eba9
|
增加角标
|
2023-12-18 14:23:18 +08:00 |
|
dearlin
|
b4c3061e84
|
沧州矿石项目修改
|
2023-12-18 10:45:21 +08:00 |
|
dearlin
|
f5f2863195
|
沧州矿石项目修改
|
2023-12-18 10:43:38 +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 |
|
dearlin
|
331e779e11
|
add: 数据同步相关aop功能迁移
|
2023-12-17 15:48:56 +08:00 |
|
dearlin
|
9757d08f69
|
数据同步相关代码
|
2023-12-17 15:44:38 +08:00 |
|
dearlin
|
7073565e0b
|
add: 沧州矿石代码同步加地图版本
|
2023-12-17 15:29:45 +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 |