Commits · 825b6c21502070f97a4e1e2284a299df39896cf6 · 项目统一框架 / amos-boot-biz

11 Oct, 2024 3 commits
- 31185 站端设备平台v5>运行趋势>运行监视>水箱液位趋势，液位值查询错误 · 825b6c21
  张森 authored Oct 11, 2024
  
  825b6c21
- Merge remote-tracking branch 'origin/develop_bugfix@dl' into develop_bugfix@dl · a41fb46f
  KeYong authored Oct 11, 2024
  
  a41fb46f
- 提交脚本执行后端逻辑 · 40d40a63
  KeYong authored Oct 11, 2024
  
  40d40a63
10 Oct, 2024 3 commits
- fix: 水池液位趋势、CAFS水箱液位趋势-时间点未上报数据时则取上次上报的数据 · ba25aa32
  李秀明 authored Oct 10, 2024
  
  ba25aa32
- 删除多余日志打印 · 335fcc8c
  李秀明 authored Oct 10, 2024
  
  335fcc8c
- fix: BUG#24036 消防器材，备品备件名称应该修改成“备品物资”，备品物资下应统计备品备件的总数和库存器材的总数 · 764d3bd1
  李秀明 authored Oct 10, 2024
  
  764d3bd1
09 Oct, 2024 4 commits
- fix: BUG#23962 消防装备，装备定义的数量的查询接口查询出的数据，和设备卡片的数据不一致 · d0013ad6
  李秀明 authored Oct 09, 2024
  
  d0013ad6
- fix: BUG#23990 消防器材，点击查看器材详情，器材分类字段回显不正确 · b145a12a
  李秀明 authored Oct 09, 2024
  
  b145a12a
- build(pom): 取消排除依赖 · 82bfdf68
  李秀明 authored Oct 09, 2024
  
  82bfdf68
- 系统部件图标取值修改 · 570b2f87
  李秀明 authored Oct 09, 2024
  
  570b2f87
30 Sep, 2024 1 commit
- 车辆数量查询API修改（预警生成） · c90e6808
  张森 authored Sep 30, 2024
  
  c90e6808
26 Sep, 2024 12 commits

Merge branch 'refs/heads/develop_dl' into develop_bugfix@dl · 2c0c73d8
李秀明 authored Sep 26, 2024

2c0c73d8
修改消防器材接去掉系统过滤 · e7552b13
KeYong authored Sep 26, 2024

e7552b13
修改消防器材接去掉系统过滤 · b9c47c64
KeYong authored Sep 26, 2024

b9c47c64
Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 10f7894d
KeYong authored Sep 26, 2024

10f7894d
修改消防器材接口排序问题 · 408734f5
KeYong authored Sep 26, 2024

408734f5
移除重复方法 · 20b4a519
李秀明 authored Sep 26, 2024

20b4a519
Revert "平台登陆接口替换" · 6c7b7235
李秀明 authored Sep 26, 2024
```
This reverts commit 06e933ef
```
6c7b7235
Revert "tyboot升级 -> 1.1.25-DL-SNAPSHOT 与东东确认删除该排除代码" · e72b3616
李秀明 authored Sep 26, 2024
```
This reverts commit ae7a15a5.
```
e72b3616
Revert "tyboot升级 -> 1.1.25-DL-SNAPSHOT" · 6496a8b6
李秀明 authored Sep 26, 2024
```
This reverts commit 37a9ce85.
```
6496a8b6

Merge branch 'refs/heads/develop_dl' into develop_bugfix@dl · 7ef60dc7

authored Sep 26, 2024

# Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
#	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/UnitTransformUtil.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/KeyWordsInfoController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/PressurePumpServiceImpl.java
#	amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

7ef60dc7

Merge remote-tracking branch 'origin/develop_dl_bugfix_0723' into develop_dl_bugfix_0723 · ce18026f
李秀明 authored Sep 26, 2024

ce18026f
修改pom处理打包失败问题 · 9b94f8da
李秀明 authored Sep 26, 2024

9b94f8da

25 Sep, 2024 2 commits
- 预警相关jcs代码提交 · b8c4d588
  张森 authored Sep 25, 2024
  
  b8c4d588
- 修改消防器材接口增加bizOrgCode过滤 · 76cf9c14
  KeYong authored Sep 25, 2024
  
  76cf9c14
24 Sep, 2024 1 commit
- 修改告警列表筛选 · 1c585cf0
  KeYong authored Sep 24, 2024
  
  1c585cf0
23 Sep, 2024 9 commits
- 统一消防资源-消防器材设备统计逻辑 · d144bc0a
  李秀明 authored Sep 23, 2024
  
  d144bc0a
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 89e216c3
  KeYong authored Sep 23, 2024
  
  89e216c3
- 修改系统详情查询系统部件个数接口 · f2a2068c
  KeYong authored Sep 23, 2024
  
  f2a2068c
- 时间格式bug修改 · e5801a74
  张森 authored Sep 23, 2024
  
  e5801a74
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 4b2452c3
  李秀明 authored Sep 23, 2024
  
  4b2452c3
- 统一消防资源-消防器材设备统计逻辑 · 1bf2a96d
  李秀明 authored Sep 23, 2024
  
  1bf2a96d
- 时间格式问题 · d9be86e8
  张森 authored Sep 23, 2024
  
  d9be86e8
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 4fc4df38
  KeYong authored Sep 23, 2024
  
  4fc4df38
- 统一消防资源-消防器材设备统计逻辑 · 62347008
  KeYong authored Sep 23, 2024
  
  62347008
20 Sep, 2024 5 commits
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · e8e18567
  张森 authored Sep 20, 2024
  
  e8e18567
- 30546 运行趋势页签接口开发 · 5a983b74
  张森 authored Sep 20, 2024
  
  5a983b74
- 消防系统分组查询接口SQL报错处理 · cd559323
  李秀明 authored Sep 20, 2024
  
  cd559323
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · b9ae6138
  张森 authored Sep 20, 2024
  
  b9ae6138
- 30546 运行趋势页签接口开发 · 9803ced7
  张森 authored Sep 20, 2024
  
  9803ced7