liulixin
|
5f53def846
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-11 16:39:14 +08:00 |
|
liulixin
|
2ab3f6c70e
|
dockData
@DockAnnotation
追加
|
2024-01-11 16:38:56 +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 |
 dearlin
|
1830f4eb81
|
线上环境配置
|
2024-01-11 10:46:20 +08:00 |
|
liulixin
|
91f52699d4
|
add-log mq-日志记录
|
2024-01-10 16:53:30 +08:00 |
|
zhaoyu
|
4ef537536d
|
沧州较大隐患图片未同步问题
|
2024-01-09 17:42:02 +08:00 |
|
zhaoyu
|
fc7c6d7a55
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:40:37 +08:00 |
|
zhaoyu
|
e432c116f9
|
特级动火列表时间不对问题
|
2024-01-09 16:40:30 +08:00 |
|
zhaoyu
|
e14165e4cc
|
动火作业时间不对bug修复
|
2024-01-09 16:40:03 +08:00 |
|
liulixin
|
8ee622cdf2
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:13:25 +08:00 |
|
liulixin
|
fdaa0401fd
|
add-log
|
2024-01-09 16:13:13 +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 |
|
zhaoyu
|
98706069a5
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:11:31 +08:00 |
|
zhaoyu
|
ea14695b16
|
特级动火丢数据问题
|
2024-01-09 16:11:23 +08:00 |
|
dearlin
|
6719a3bba3
|
Merge branch '2023年12月27日V01.00.50' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj into guoyuepeng-2023年12月27日V01.00.50
|
2024-01-09 16:04:10 +08:00 |
|
dearlin
|
b774003e5e
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 16:01:30 +08:00 |
|
dearlin
|
e27862fe53
|
门禁闸机地图对接
|
2024-01-09 16:01:16 +08:00 |
 songwenxuan
|
a3579dd7c2
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-09 11:53:04 +08:00 |
|
songwenxuan
|
a8dcb36b56
|
pc端对接问题修复
|
2024-01-09 11:52:42 +08:00 |
|
dearlin
|
7437aa1395
|
沧州矿石文件导入报错
|
2024-01-09 10:58:26 +08:00 |
|
dearlin
|
06fa5a4f74
|
沧州矿石文件导入报错
|
2024-01-08 18:44:57 +08:00 |
limingyu
|
e446d1d43b
|
特种作业人员对接
|
2024-01-08 18:36:40 +08:00 |
|
dearlin
|
b59f7dee6d
|
视频播放相关代码
|
2024-01-08 18:07:37 +08:00 |
|
limingyu
|
27f2bf7925
|
对接bug修复
|
2024-01-08 16:38:30 +08:00 |
|
dearlin
|
d4d4de3185
|
平台视频，电子围栏，围栏报警。
|
2024-01-08 14:55:15 +08:00 |
|
zhaoyu
|
bfd9ee0928
|
重点工程附件没名称问题
|
2024-01-08 09:18:55 +08:00 |
|
dearlin
|
df3a0b5d76
|
Merge branch 'czks1.0' of http://47.92.113.182:3000/czks/qa-prevention-czks-b into czks1.0
|
2024-01-08 09:16:38 +08:00 |
|
dearlin
|
3fe3d5e010
|
人员定位
|
2024-01-08 09:16:25 +08:00 |
|
zhaoyu
|
7e2b6b468d
|
沧州同步到港务局接口增加
|
2024-01-06 18:16:25 +08:00 |
|
zhaoyu
|
7405fd91b7
|
111
|
2024-01-06 18:10:11 +08:00 |
|
songwenxuan
|
73983d5e0a
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-06 18:01:42 +08:00 |
|
songwenxuan
|
48d3783665
|
pc端对接问题修复
|
2024-01-06 18:01:18 +08:00 |
|
dearlin
|
6fef2c1407
|
沧州矿石数据同步日志
|
2024-01-06 15:24:03 +08:00 |
|
dearlin
|
12d0079c3b
|
缺少的文件
|
2024-01-06 10:52:36 +08:00 |
|
limingyu
|
9d8d1d4f7a
|
八项作业对接问题修改1
|
2024-01-05 15:12:26 +08:00 |
|
1261008090@qq.com
|
3da9ff64aa
|
Merge branch 'czks1.0' of http://47.92.113.182:3000/czks/qa-prevention-czks-b into czks1.0
|
2024-01-05 14:15:20 +08:00 |
|
1261008090@qq.com
|
df3c2fa9ee
|
人员定位
|
2024-01-05 14:14:52 +08:00 |
|
songwenxuan
|
b9e6f60fff
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-05 10:46:53 +08:00 |
|
songwenxuan
|
7f54a389f7
|
pc端对接问题修复
|
2024-01-05 10:46:28 +08:00 |
|
limingyu
|
981d788c5d
|
动火作业bug修改1
|
2024-01-04 16:17:17 +08:00 |
|
limingyu
|
746285d34c
|
应急资源管理bug修改
|
2024-01-04 14:20:36 +08:00 |
|
liulixin
|
d4ae1c385d
|
bug fix
|
2024-01-03 17:26:34 +08:00 |
|
songwenxuan
|
32928c77ea
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-03 17:04:41 +08:00 |
|
songwenxuan
|
87f693a26c
|
pc端对接问题修复
|
2024-01-03 17:04:30 +08:00 |
chenxinying
|
38864124bf
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-03 09:36:07 +08:00 |
|
chenxinying
|
d99b4fa396
|
map dockData而不是pd dockData
|
2024-01-03 09:35:57 +08:00 |
|
limingyu
|
52b5698a7e
|
八项作业app对接 bug修改
|
2024-01-02 18:16:44 +08:00 |
|
songwenxuan
|
1e72756a07
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-02 16:49:01 +08:00 |
|
songwenxuan
|
d505ea199b
|
pc端对接问题修复
|
2024-01-02 16:48:49 +08:00 |
|
liulixin
|
199a689e34
|
NPE
|
2024-01-02 16:32:59 +08:00 |
|
liujun
|
4be8922c59
|
相关方端bug
|
2024-01-02 14:12:40 +08:00 |
|
limingyu
|
178f531c3e
|
八项作业app bug修改
|
2024-01-02 09:44:01 +08:00 |
|
songwenxuan
|
404bb8547a
|
pc端对接问题修复
|
2023-12-29 17:42:29 +08:00 |
|
songwenxuan
|
7fb1cc39e1
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-29 17:36:49 +08:00 |
|
songwenxuan
|
e03d531107
|
pc端对接问题修复
|
2023-12-29 17:36:09 +08:00 |
|
dearlin
|
636ad0931e
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-29 14:46:37 +08:00 |
|
dearlin
|
04e915e1a4
|
图片前缀
|
2023-12-29 14:46:25 +08:00 |
|
songwenxuan
|
059e5aaa1d
|
对接代码dockData补充
|
2023-12-29 12:01:13 +08:00 |
|
songwenxuan
|
76121e6cb1
|
对接代码dockData补充
|
2023-12-29 11:28:58 +08:00 |
|
songwenxuan
|
9d3e6e06d4
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-29 11:27:27 +08:00 |
|
songwenxuan
|
c81dd7dcbd
|
对接代码dockData补充
|
2023-12-29 11:26:41 +08:00 |
|
dearlin
|
cb54c67d4e
|
重点工程流程完善
|
2023-12-29 11:05:41 +08:00 |
|
dearlin
|
0e778fd1d9
|
fix:使用的库不准确的问题
|
2023-12-28 21:34:59 +08:00 |
|
dearlin
|
b2733dd3d1
|
add:合并线上代码
|
2023-12-28 20:03:02 +08:00 |
|
dearlin
|
d5530c6ee6
|
add:重点工程数据同步
|
2023-12-28 19:51:22 +08:00 |
|
dearlin
|
a7f6193998
|
add:重点工程数据同步
|
2023-12-28 19:33:26 +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 |
|
songwenxuan
|
f36417ce03
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-28 13:45:58 +08:00 |
|
songwenxuan
|
26dbfb49ce
|
对接代码新加
|
2023-12-28 13:45:43 +08:00 |
|
dearlin
|
dd2f6b3f1e
|
线上代码合并到czks1.0
|
2023-12-28 13:40:16 +08:00 |
|
dearlin
|
9912c725af
|
Merge remote-tracking branch 'origin/2023年12月27日V01.00.50' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
# src/main/java/com/zcloud/service/system/UsersService.java
# src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
# src/main/resources/application-local.properties
# src/main/resources/application-master.properties
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
|
2023-12-28 12:00:38 +08:00 |
|
dearlin
|
bc05a89ae6
|
合并线上代码
|
2023-12-28 11:58:54 +08:00 |
z
|
3575a5fc28
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/app/AppImgFilesController.java
# src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
|
2023-12-28 10:27:54 +08:00 |
|
z
|
77bdb85662
|
重点工程部分代码
|
2023-12-28 10:23:30 +08:00 |
|
dearlin
|
9becfa6a9f
|
档案，学习，特种设备
|
2023-12-28 09:18:15 +08:00 |
|
liujun
|
b057d96317
|
学习园地、教育培训功能数据同步功能
|
2023-12-27 14:50:18 +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 |
|
dearlin
|
e86570bb8d
|
无dockData不发送消息
|
2023-12-26 11:54:38 +08:00 |
|
guoyuepeng
|
021a6551a3
|
动态地址的默认信息
|
2023-12-26 11:48:51 +08:00 |