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

18 Jun, 2024 4 commits
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · dcb12c6f
  张森 authored Jun 18, 2024
  
  dcb12c6f
- bug · e44d4009
  张森 authored Jun 18, 2024
  
  e44d4009
- 增加根据bizorgcode查询公司 · 5fa84f23
  xixinzhao authored Jun 18, 2024
  
  5fa84f23
- 中心BUG修改 · 11bb412a
  litengwei authored Jun 18, 2024
  
  11bb412a
14 Jun, 2024 2 commits
- 中心BUG修改 · e98565f0
  litengwei authored Jun 14, 2024
  
  e98565f0
- 中心BUG修改 · 0d5ce5f5
  litengwei authored Jun 14, 2024
  
  0d5ce5f5
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
05 Jun, 2024 1 commit
- 至少8人出勤 · 2434d1fa
  litengwei authored Jun 05, 2024
  
  2434d1fa
04 Jun, 2024 1 commit
- 至少一次巡查触发逻辑 · 41a558c7
  litengwei authored Jun 04, 2024
  
  41a558c7
03 Jun, 2024 2 commits
- 至少一次巡查触发逻辑 · 4e251752
  litengwei authored Jun 03, 2024
  
  4e251752
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · fd41e3bb
  KeYong authored Jun 03, 2024
  
  fd41e3bb
31 May, 2024 13 commits
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 6f6bf58c
  张森 authored May 31, 2024
  
  6f6bf58c
- 装备数量、吨数问题处理 · 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
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 434809c8
  张森 authored May 31, 2024
  
  434809c8
- 装备数量、吨数问题处理 · 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
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 7a3eb688
  张森 authored May 31, 2024
  
  7a3eb688
- 装备列表优化 · df7a0674
  张森 authored May 31, 2024
  
  df7a0674
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 3075cccb
  张森 authored May 31, 2024
  
  3075cccb
- 装备列表优化 · 16b57e64
  张森 authored May 31, 2024
  
  16b57e64
30 May, 2024 4 commits
- Merge remote-tracking branch 'origin/develop_dl_bugfix' into develop_dl_bugfix · a8cdcfa2
  litengwei authored May 30, 2024
  
  a8cdcfa2
- 至少一次巡查触发逻辑 · faf5991d
  litengwei authored May 30, 2024
  
  faf5991d
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 08880846
  张森 authored May 30, 2024
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/application-dev.properties
```
  08880846
- 装备列表优化 · 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 3 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