Commits · 911f9d8cc8ec36683d101262c1271c7dd0e5352f · 项目统一框架 / amos-boot-biz

24 Aug, 2024 4 commits
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 911f9d8c
  张森 authored Aug 24, 2024
  
  911f9d8c
- 默认值添加 · a1cbca03
  张森 authored Aug 24, 2024
  
  a1cbca03
- 修改消防炮状态和流量取值问题 · bd0bb7c8
  KeYong authored Aug 24, 2024
  
  bd0bb7c8
- kafka消息过滤 · 4e249086
  张森 authored Aug 24, 2024
  
  4e249086
21 Aug, 2024 1 commit
- 稳压泵统计改为近三天 · 940986df
  张森 authored Aug 21, 2024
  
  940986df
20 Aug, 2024 1 commit
- kafka接消息逻辑中处理稳压泵 · 8593722a
  xixinzhao authored Aug 20, 2024
  
  8593722a
19 Aug, 2024 4 commits
- 排除稳压泵走通用告警 · a9ef77d7
  xixinzhao authored Aug 20, 2024
  
  a9ef77d7
- 稳压泵告警增加延时 · 2d404a01
  xixinzhao authored Aug 20, 2024
  
  2d404a01
- 排油系统API sql修改 · e82157ab
  张森 authored Aug 19, 2024
  
  e82157ab
- 排油系统API 开发 · 7a528508
  张森 authored Aug 19, 2024
  
  7a528508
18 Jul, 2024 1 commit
- 处理空指针异常 · 2929f340
  maoying authored Jul 18, 2024
  
  2929f340
01 Jul, 2024 2 commits
- 修改列名 · 38f6c2ad
  KeYong authored Jul 01, 2024
  
  38f6c2ad
- 现场车辆查询问题处理 · 0d5e07a1
  张森 authored Jul 01, 2024
  
  0d5e07a1
21 Jun, 2024 2 commits
- http://113.142.68.105:5080/zentao/task-view-26884.html · 0b634e39
  张森 authored Jun 21, 2024
  
  0b634e39
- 26852 【中心级】一张图大屏>消防资源监盘，查看人员无证的预警详情，再次点击人员姓名跳转人员信息卡，工作记录页签下的消防记录查询接口报错 · 5e756ef4
  张森 authored Jun 21, 2024
  
  5e756ef4
19 Jun, 2024 2 commits
- 返回值错误问题 · 4cb109fd
  张森 authored Jun 19, 2024
  
  4cb109fd
- 车辆消码 · 1d3ed2bd
  张森 authored Jun 19, 2024
  
  1d3ed2bd
18 Jun, 2024 2 commits
- bug · e44d4009
  张森 authored Jun 18, 2024
  
  e44d4009
- 增加根据bizorgcode查询公司 · 5fa84f23
  xixinzhao authored Jun 18, 2024
  
  5fa84f23
13 Jun, 2024 1 commit
- 修改预警详情装备信息bug · f14f1b8a
  KeYong authored Jun 13, 2024
  
  f14f1b8a
07 Jun, 2024 6 commits
- 稳压泵信息添加排序字段 · 43fd9899
  KeYong authored Jun 07, 2024
  
  43fd9899
- Merge branch 'develop_dl_3.7.1.1' into develop_dl · 06154ff8
  KeYong authored Jun 07, 2024
  
  06154ff8
- 修改单位修改不起作用问题 · 31868acc
  KeYong authored Jun 07, 2024
  
  31868acc
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · e0d7d8e6
  xixinzhao authored Jun 07, 2024
  
  e0d7d8e6
- Merge branch 'develop_dl' of F:\myWorkspace\amosBootBiz with conflicts. · 35fa7aee
  xixinzhao authored Jun 07, 2024
  
  35fa7aee
- 提交稳压泵实时数据查询接口 · bbd308de
  KeYong authored Jun 07, 2024
  
  bbd308de
03 Jun, 2024 1 commit
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · fd41e3bb
  KeYong authored Jun 03, 2024
  
  fd41e3bb
31 May, 2024 9 commits
- 装备数量、吨数问题处理 · 4a9040c0
  张森 authored May 31, 2024
  
  4a9040c0
- Merge branch 'develop_dl_3.7.1.1' into develop_dl · 694d0de7
  KeYong authored May 31, 2024
```
# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
```
  694d0de7
- 提交告警规则 · 7052a6ca
  KeYong authored May 31, 2024
  
  7052a6ca
- 装备数量、吨数问题处理 · 0a0bba66
  张森 authored May 31, 2024
  
  0a0bba66
- 稳压泵API修改和新API开发 · 110e1500
  张森 authored May 31, 2024
  
  110e1500
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 8e2e4cec
  KeYong authored May 31, 2024
  
  8e2e4cec
- 修改责任制管理人员统计 · dcf4873b
  KeYong authored May 31, 2024
  
  dcf4873b
- 装备列表优化 · df7a0674
  张森 authored May 31, 2024
  
  df7a0674
- 装备列表优化 · 16b57e64
  张森 authored May 31, 2024
  
  16b57e64
30 May, 2024 1 commit
- 装备列表优化 · 76c5d1ae
  张森 authored May 30, 2024
  
  76c5d1ae
29 May, 2024 3 commits
- Merge branch 'develop_dl_3.7.1.1' into develop_dl · 16a297ce
  KeYong authored May 29, 2024
```
# Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Car.java
#	amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
```
  16a297ce
- 提交车辆使用方式 · 2185c814
  KeYong authored May 29, 2024
  
  2185c814
- 修改管理人员统计bug · 2c5fa0ff
  KeYong authored May 29, 2024
  
  2c5fa0ff