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

17 Jul, 2023 15 commits
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 1f546c48
  chenzhao authored Jul 17, 2023
  
  1f546c48
- 图片接口修改 · 95c48e7d
  chenzhao authored Jul 17, 2023
  
  95c48e7d
- 模拟量消息 · 238fc039
  zhangsen authored Jul 17, 2023
  
  238fc039
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 83c95ead
  chenzhao authored Jul 17, 2023
  
  83c95ead
- 增加接口 · 46083d01
  chenzhao authored Jul 17, 2023
  
  46083d01
- 修改字段 · 03c83ad7
  xixinzhao authored Jul 17, 2023
  
  03c83ad7
- 增加字段 · c30d1f78
  xixinzhao authored Jul 17, 2023
  
  c30d1f78
- mysql及influxdb新增pictureName字段 · f232233c
  caotao authored Jul 17, 2023
  
  f232233c
- 审核提交 · a13937f5
  xixinzhao authored Jul 17, 2023
  
  a13937f5
- 解决冲突 · 2facb231
  tangwei authored Jul 17, 2023
  
  2facb231
- 新增字段 · 1c30f844
  tangwei authored Jul 17, 2023
  
  1c30f844
- 修改设计信息的字段类型和包路径 · 3443f7f7
  leizhan authored Jul 17, 2023
  
  3443f7f7
- 提交启动工作流 · 57e9ba3d
  xixinzhao authored Jul 17, 2023
  
  57e9ba3d
- 怎加字段 · 8797a06d
  tangwei authored Jul 17, 2023
  
  8797a06d
- 初始化风机与升压站调整 · 11b81232
  caotao authored Jul 17, 2023
  
  11b81232
15 Jul, 2023 13 commits
- 修改：勘察详情页，设计信息对象返回出错的问题 · 2f47243d
  leizhan authored Jul 15, 2023
  
  2f47243d
- 农户勘察详情中，返回设计信息对象 · 4b5df648
  leizhan authored Jul 15, 2023
  
  4b5df648
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 5d998a47
  chenzhao authored Jul 15, 2023
  
  5d998a47
- 开关优化为消息接口 · 8463cf1c
  chenzhao authored Jul 15, 2023
  
  8463cf1c
- 升压站动态图片接口 · 20ce594e
  caotao authored Jul 15, 2023
  
  20ce594e
- 修改代码 · 97659aed
  chenzhao authored Jul 15, 2023
  
  97659aed
- 开关图片地址接口 · 2259e2ec
  chenzhao authored Jul 15, 2023
  
  2259e2ec
- 修改代码 · 6d74c814
  tangwei authored Jul 15, 2023
  
  6d74c814
- 修改错误 · 938f3b75
  tangwei authored Jul 15, 2023
  
  938f3b75
- 初始化风机与升压站调整 · 8be28b39
  caotao authored Jul 15, 2023
  
  8be28b39
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · a52291ba
  chenzhao authored Jul 15, 2023
```
# Conflicts:
#	amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
```
  a52291ba
- 电量表计/故障信息接口 · 677f4b84
  chenzhao authored Jul 15, 2023
  
  677f4b84
- 审核记录表 · 813fbbd3
  tangwei authored Jul 15, 2023
  
  813fbbd3
14 Jul, 2023 8 commits
- 设计信息表 · c4396c2d
  tangwei authored Jul 14, 2023
  
  c4396c2d
- bug · 494a6b67
  zhangsen authored Jul 14, 2023
  
  494a6b67
- Merge remote-tracking branch 'origin/developer' into developer · 89e05eda
  zhangsen authored Jul 14, 2023
  
  89e05eda
- 升压站主屏消息接口开发 · 01dd19c8
  zhangsen authored Jul 14, 2023
  
  01dd19c8
- 地图片区dto新增片区code · fce8e773
  caotao authored Jul 14, 2023
  
  fce8e773
- 96333接口修改提交 · 869b87f4
  tianbo authored Jul 14, 2023
  
  869b87f4
- 1.大屏中间地图接口返回新增platformStationId字段。 · 04991136
  caotao authored Jul 14, 2023
```
2.地图区域新增areaCode字段。
3.indicator字段名称进行修改。
```
  04991136
- 模拟量消息开发 xiugai · ac4f08c5
  zhangsen authored Jul 14, 2023
  
  ac4f08c5
13 Jul, 2023 4 commits
- 优化勘察信息录入，部分信息自动赋值回填 · 83e0cd3e
  leizhan authored Jul 13, 2023
  
  83e0cd3e
- 模拟量消息开发 · 563155ee
  zhangsen authored Jul 13, 2023
  
  563155ee
- sql修改 · 53375ff4
  zhangsen authored Jul 13, 2023
  
  53375ff4
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 1fe8adb3
  chenzhao authored Jul 13, 2023
```
# Conflicts:
#	amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
#	amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
```
  1fe8adb3