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

26 Feb, 2025 1 commit
- 更新maven私服地址 · 84ce1783
  KeYong authored Feb 26, 2025
  
  84ce1783
25 Feb, 2025 1 commit
- 古泉现场反馈去掉code拼接 · 6e0af142
  KeYong authored Feb 25, 2025
  
  6e0af142
01 Jul, 2024 6 commits
- 中心BUG修改 · 027eeeb1
  litengwei authored Jul 02, 2024
  
  027eeeb1
- Merge remote-tracking branch 'origin/develop_dl_bugfix' into develop_dl_bugfix · 39cfe4bc
  litengwei authored Jul 02, 2024
  
  39cfe4bc
- 中心BUG修改 · 0cd3ddb3
  litengwei authored Jul 02, 2024
  
  0cd3ddb3
- Merge branch 'develop_dl' into develop_dl_bugfix · d2212a9d
  张森 authored Jul 01, 2024
```
# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
```
  d2212a9d
- 修改列名 · 38f6c2ad
  KeYong authored Jul 01, 2024
  
  38f6c2ad
- 现场车辆查询问题处理 · 0d5e07a1
  张森 authored Jul 01, 2024
  
  0d5e07a1
21 Jun, 2024 3 commits
- http://113.142.68.105:5080/zentao/task-view-26884.html · 0b634e39
  张森 authored Jun 21, 2024
  
  0b634e39
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 1a6a1bec
  张森 authored Jun 21, 2024
  
  1a6a1bec
- 26852 【中心级】一张图大屏>消防资源监盘，查看人员无证的预警详情，再次点击人员姓名跳转人员信息卡，工作记录页签下的消防记录查询接口报错 · 5e756ef4
  张森 authored Jun 21, 2024
  
  5e756ef4
19 Jun, 2024 7 commits
- 中心BUG修改 · 9140a2de
  litengwei authored Jun 19, 2024
  
  9140a2de
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix · 35fb6e88
  张森 authored Jun 19, 2024
  
  35fb6e88
- 返回值错误问题 · 4cb109fd
  张森 authored Jun 19, 2024
  
  4cb109fd
- 中心BUG修改 · daca9c41
  litengwei authored Jun 19, 2024
  
  daca9c41
- Merge branch 'develop_dl' into develop_dl_bugfix · a6eb8465
  litengwei authored Jun 19, 2024
  
  a6eb8465
- 车辆消码 · 1d3ed2bd
  张森 authored Jun 19, 2024
  
  1d3ed2bd
- 中心BUG修改 · 2e4979d0
  litengwei authored Jun 19, 2024
  
  2e4979d0
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 5 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