Commits · 5fa84f23b98612e6f8345ce2522660a83da83e16 · 项目统一框架 / amos-boot-biz

18 Jun, 2024 1 commit
- 增加根据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
28 May, 2024 15 commits
- fix: 今日报警次数统计替换为未复归设备数量统计 · e8d4a69b
  李秀明 authored May 28, 2024
  
  e8d4a69b
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 6870274d
  李秀明 authored May 28, 2024
  
  6870274d
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 653a1b93
  KeYong authored May 28, 2024
  
  653a1b93
- 修改消防坦克装备分类 · 12f74ed2
  KeYong authored May 28, 2024
  
  12f74ed2
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · ccf599b3
  李秀明 authored May 28, 2024
  
  ccf599b3
- fix: 消防系统统计装备数量错误 · 6f0f47e2
  李秀明 authored May 28, 2024
  
  6f0f47e2
- fix: 管理人员列表数据查询错误 · 13795c4a
  李秀明 authored May 28, 2024
  
  13795c4a
- 备品备件修改数量问题处理 · 42f77952
  张森 authored May 28, 2024
  
  42f77952
- fix: 备品备件装备定义列表过滤掉非消耗性设备 · 3134a5f3
  李秀明 authored May 28, 2024
  
  3134a5f3
- fix: 备品备件过滤掉数量为0的数据 · 876e4884
  李秀明 authored May 28, 2024
  
  876e4884
- feat: 人员装备功能开发 · a4ec6565
  李秀明 authored May 28, 2024
  
  a4ec6565
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · d9a4b78c
  李秀明 authored May 28, 2024
  
  d9a4b78c
- 装备报废消息发送至中心级 · 77bb1584
  张森 authored May 28, 2024
  
  77bb1584
- 装备报废消息发送至中心级 · 69e98bb0
  张森 authored May 28, 2024
  
  69e98bb0
- 装备报废消息发送至中心级 · df598008
  张森 authored May 28, 2024
  
  df598008
27 May, 2024 2 commits
- fix: 备品保存空指针、列表缺失缩略图问题处理 · 66961d5a
  李秀明 authored May 27, 2024
  
  66961d5a
- 消息转发问题 · f693e30b
  张森 authored May 27, 2024
  
  f693e30b
24 May, 2024 1 commit
- 更新排序 · d0ca3692
  KeYong authored May 24, 2024
  
  d0ca3692