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

16 May, 2023 9 commits
- 升级版本号 · d79b844d
  xixinzhao authored May 16, 2023
  
  d79b844d
- Merge branch 'develop_dl' into develop_0516 · 9faf7113
  xixinzhao authored May 16, 2023
  
  9faf7113
- 修改代码 · d29fd966
  chenzhao authored May 16, 2023
  
  d29fd966
- 修改巡检代码 · 3dc80e2e
  chenzhao authored May 16, 2023
  
  3dc80e2e
- 修改代码 · 369f0a21
  chenzhao authored May 16, 2023
  
  369f0a21
- 增加批量修改alarmlog状态 · 720f98c5
  chenzhao authored May 16, 2023
  
  720f98c5
- Merge branch 'develop_dl' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl · 4859f9b7
  KeYong authored May 16, 2023
  
  4859f9b7
- 修改鄱阳湖现场余量显示问题 · 56dd0956
  KeYong authored May 16, 2023
  
  56dd0956
- 更新 · 4e060184
  KeYong authored May 16, 2023
  
  4e060184
15 May, 2023 4 commits
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · bfda8e3b
  litengwei authored May 15, 2023
  
  bfda8e3b
- 全局监控-中心级监控屏运维人员无证的人数统计错误（cb_firefighter_post表的所有人都选了持证 · e14d525b
  litengwei authored May 15, 2023
  
  e14d525b
- 修改车辆地图车牌号显示问题 · 93c08079
  lisong authored May 15, 2023
  
  93c08079
- sql bug · d3be9e28
  zhangsen authored May 15, 2023
  
  d3be9e28
13 May, 2023 4 commits
- bug xiugai · f022de5b
  zhangsen authored May 13, 2023
  
  f022de5b
- Merge branch 'develop_dl' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl · b7ca0286
  chenzhao authored May 13, 2023
  
  b7ca0286
- 修改代码 · b1a61cb3
  chenzhao authored May 13, 2023
  
  b1a61cb3
- 大屏人员出勤bug · 25ef10b1
  xixinzhao authored May 13, 2023
  
  25ef10b1
12 May, 2023 7 commits
- 修改设备指标单位获取数据源 · e92d197f
  lisong authored May 12, 2023
  
  e92d197f
- 修改持证人员查询bug · db9af26e
  lisong authored May 12, 2023
  
  db9af26e
- 添加单位换算逻辑 · 6be5cfcf
  lisong authored May 12, 2023
  
  6be5cfcf
- 添加日志打印 · 2f30e585
  lisong authored May 12, 2023
  
  2f30e585
- 修改公共接口统计问题 · a5918e9b
  chenzhao authored May 12, 2023
  
  a5918e9b
- 修改巡检bug · e2970c5d
  chenzhao authored May 12, 2023
  
  e2970c5d
- 设备添加设备状态字段 · 4c4a7902
  maoying authored May 12, 2023
  
  4c4a7902
11 May, 2023 2 commits
- 修改车辆里程切分定时任务bug · 7f330af3
  lisong authored May 11, 2023
  
  7f330af3
- 日历打点过滤小于500米的里程记录 · 4d5abe97
  lisong authored May 11, 2023
  
  4d5abe97
10 May, 2023 4 commits
- 修改日历标点bug · 5130cf04
  lisong authored May 10, 2023
  
  5130cf04
- Merge branch 'develop_dl' into develop_0510 · 03a70a24
  xixinzhao authored May 10, 2023
```
# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java
```
  03a70a24
- 消息提醒相关信息修改bug · 13363f8c
  zhangsen authored May 10, 2023
  
  13363f8c
- 修改代码 · 8ed928b0
  chenzhao authored May 10, 2023
  
  8ed928b0
09 May, 2023 4 commits
- Merge remote-tracking branch 'origin/develop_dl' into develop_dl · 4ac1523f
  KeYong authored May 09, 2023
  
  4ac1523f
- 更新预案获取人员图像 · 0140da70
  KeYong authored May 09, 2023
  
  0140da70
- 消息提醒相关信息修改 · d88f1080
  zhangsen authored May 09, 2023
  
  d88f1080
- 消息提醒相关信息修改 · 8c7005d2
  zhangsen authored May 09, 2023
  
  8c7005d2
08 May, 2023 5 commits
- Merge branch 'develop_dl_3.7.0.8' of http://39.98.45.134:8090/moa/amos-boot-biz… · 4d285259
  chenzhao authored May 08, 2023
```
Merge branch 'develop_dl_3.7.0.8' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_3.7.0.8
```
  4d285259
- 增加接口 · b85f271b
  chenzhao authored May 08, 2023
  
  b85f271b
- 添加里程切分定时任务执行corn表达式 · 91788847
  lisong authored May 08, 2023
  
  91788847
- 添加0点里程切分定时任务 · 06c8bb40
  lisong authored May 08, 2023
  
  06c8bb40
- 巡检报告中上传缺陷相关 bug处理 · 60efd6d8
  zhangsen authored May 08, 2023
  
  60efd6d8
06 May, 2023 1 commit
- 日志打印 · 541240bc
  zhangsen authored May 06, 2023
  
  541240bc