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

09 Jun, 2022 14 commits
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 6f7e8a74
  KeYong authored Jun 09, 2022
  
  6f7e8a74
- 提交报表相关bug · 664b47df
  KeYong authored Jun 09, 2022
  
  664b47df
- 修改视频监控批量导入时建筑位置字段保存错误修改(wl_video_source:parent_source_ids) · 98859d13
  tianbo authored Jun 09, 2022
```
bug6303,bug6287
```
  98859d13
- 合并developer代码解决冲突 · 9dad0c39
  maoying authored Jun 09, 2022
  
  9dad0c39
- 删除无用注释 · 9a8983d2
  maoying authored Jun 09, 2022
  
  9a8983d2
- 解决合并冲突 · cbbad08e
  maoying authored Jun 09, 2022
  
  cbbad08e
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · e2d5c8b6
  maoying authored Jun 09, 2022
  
  e2d5c8b6
- 取消车辆装备新增编辑删除物联编码消息注册，整体使用通配符 · db0fbb7b
  maoying authored Jun 09, 2022
  
  db0fbb7b
- 1.实现类复制错误 · 11c91ca0
  suhuiguang authored Jun 09, 2022
  
  11c91ca0
- 1.修改mqtt消息重复 · 3baf70fc
  suhuiguang authored Jun 09, 2022
```
2.新增报表demo
```
  3baf70fc
- Merge remote-tracking branch 'origin/developer' into developer · ca6e61c2
  lisong authored Jun 09, 2022
  
  ca6e61c2
- 修改bug · ea1e66f2
  lisong authored Jun 09, 2022
  
  ea1e66f2
- 改bug · 214ec2d9
  zhangsen authored Jun 09, 2022
  
  214ec2d9
- 改bug · 131be008
  zhangsen authored Jun 09, 2022
  
  131be008
08 Jun, 2022 26 commits
- 改bug · b2dcd117
  zhangsen authored Jun 08, 2022
  
  b2dcd117
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 4397dd29
  maoying authored Jun 08, 2022
  
  4397dd29
- 修改确警查询语法 · 1ba9dc87
  maoying authored Jun 08, 2022
  
  1ba9dc87
- 人员导出修改 · b5d0a41a
  xixinzhao authored Jun 08, 2022
  
  b5d0a41a
- 调整代码格式 · eb7f5eb9
  maoying authored Jun 08, 2022
  
  eb7f5eb9
- 改bug · 40fc09fe
  zhangsen authored Jun 08, 2022
  
  40fc09fe
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 8e29be2f
  maoying authored Jun 08, 2022
  
  8e29be2f
- 修改确警更新逻辑 · c65d7b6b
  maoying authored Jun 08, 2022
  
  c65d7b6b
- 修改报表下载文件名 · fb648675
  KeYong authored Jun 08, 2022
  
  fb648675
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 13101fb3
  KeYong authored Jun 08, 2022
  
  13101fb3
- 修改队伍导出 · 0fb88b47
  KeYong authored Jun 08, 2022
  
  0fb88b47
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 7650c073
  xixinzhao authored Jun 08, 2022
  
  7650c073
- 人员导出 · 20e3ea3e
  xixinzhao authored Jun 08, 2022
  
  20e3ea3e
- 修改确警脚本查询异常 · ff36bf44
  maoying authored Jun 08, 2022
  
  ff36bf44
- 人员导出 · 75be00e5
  xixinzhao authored Jun 08, 2022
  
  75be00e5
- 修改人员导出 · 4c3138e3
  xixinzhao authored Jun 08, 2022
  
  4c3138e3
- 1.人员证件号码验证bug · 2e4eb418
  suhuiguang authored Jun 08, 2022
  
  2e4eb418
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · e3fb26de
  maoying authored Jun 08, 2022
  
  e3fb26de
- 批量确警逻辑修改 · 70ff508a
  maoying authored Jun 08, 2022
  
  70ff508a
- 改bug · 9a91cd9b
  zhangsen authored Jun 08, 2022
  
  9a91cd9b
- 修改报表设备巡查占比饼图 · 31f85241
  KeYong authored Jun 08, 2022
  
  31f85241
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 38c6336a
  maoying authored Jun 08, 2022
  
  38c6336a
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 536ac158
  KeYong authored Jun 08, 2022
  
  536ac158
- 修改水源导出 · 61f5956a
  KeYong authored Jun 08, 2022
  
  61f5956a
- 导出样式 · 749c48f8
  zhangsen authored Jun 08, 2022
  
  749c48f8
- 人员导入修改 · e75446c5
  xixinzhao authored Jun 08, 2022
  
  e75446c5