liulixin
|
5fd5380385
|
闸机出入记录注释添加
|
2024-01-23 08:57:14 +08:00 |
|
liulixin
|
36b64c11b1
|
门口门禁记录
|
2024-01-19 16:57:32 +08:00 |
|
liulixin
|
63cc479f4f
|
门口门禁记录
|
2024-01-19 16:56:47 +08:00 |
|
liulixin
|
34f27ebfd4
|
门口门禁记录
|
2024-01-19 15:39:45 +08:00 |
 dearlin
|
d92c164b15
|
地图上展示八项作业相关
|
2024-01-19 08:53:29 +08:00 |
|
liulixin
|
163f532db9
|
CORPINFO_ID查询条件
追加
|
2024-01-16 12:00:35 +08:00 |
|
liulixin
|
57bd46e784
|
CORPINFO_ID查询条件
追加
|
2024-01-15 17:44:16 +08:00 |
|
dearlin
|
a512986859
|
地图上重点工程图层
|
2024-01-15 16:14:03 +08:00 |
|
dearlin
|
66ed85388f
|
港务局代码合并
|
2024-01-15 15:10:01 +08:00 |
|
dearlin
|
575b27f705
|
地图代码重构
|
2024-01-15 11:56:44 +08:00 |
|
liulixin
|
91f52699d4
|
add-log mq-日志记录
|
2024-01-10 16:53:30 +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 |
|
dearlin
|
e27862fe53
|
门禁闸机地图对接
|
2024-01-09 16:01:16 +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 |
|
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 |
 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 |
|
songwenxuan
|
d505ea199b
|
pc端对接问题修复
|
2024-01-02 16:48:49 +08:00 |
 liujun
|
4be8922c59
|
相关方端bug
|
2024-01-02 14:12:40 +08:00 |
|
dearlin
|
b2733dd3d1
|
add:合并线上代码
|
2023-12-28 20:03:02 +08:00 |
|
dearlin
|
d5530c6ee6
|
add:重点工程数据同步
|
2023-12-28 19:51:22 +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
|
26dbfb49ce
|
对接代码新加
|
2023-12-28 13:45:43 +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
|
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
|
ce4aafb5af
|
Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移
|
2023-12-25 13:55:16 +08:00 |
|
songwenxuan
|
e42976afc5
|
消防资源管理对接代码
|
2023-12-25 10:29:49 +08:00 |
|
songwenxuan
|
9a06cfa206
|
消防资源管理对接代码
|
2023-12-23 10:49:42 +08:00 |
|
liujun
|
8be39e14d3
|
查看bug修复
|
2023-12-22 17:41:36 +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 |
|
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 |
|
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 |
|
dearlin
|
e4a311fdb2
|
消防资源
|
2023-12-21 14:18:19 +08:00 |
|
liujun
|
a28d97cea7
|
相关方查看详情统一格式
|
2023-12-21 13:58:57 +08:00 |