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
|
18f4514fde
|
Merge branch 'zy-2024-01-04-bug修复' into dev-2024年1月8日
|
2024-01-10 18:01:17 +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 |
 guoyuepeng
|
06bd2c9074
|
添加 更新.md
|
2023-12-28 10:43:24 +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 |