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

09 Dec, 2022 14 commits
- 解决冲突 · 4dca0cb4
  tangwei authored Dec 09, 2022
  
  4dca0cb4
- 修改无计划巡检部门 · 3388e703
  tangwei authored Dec 09, 2022
  
  3388e703
- Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp · facfdc0b
  KeYong authored Dec 09, 2022
  
  facfdc0b
- 修改bug · 3de67164
  KeYong authored Dec 09, 2022
  
  3de67164
- 联动单位新增经纬度值班模板导出去除过滤 · 0a44d870
  chenzhao authored Dec 09, 2022
  
  0a44d870
- 暂时不修改修改类型 · 19fcdd55
  tangwei authored Dec 09, 2022
  
  19fcdd55
- 修改管网压力探测器告警bug · e910445d
  lisong authored Dec 09, 2022
  
  e910445d
- Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp · ddd0e055
  litengwei authored Dec 09, 2022
  
  ddd0e055
- 计划巡检记录返回装备code · 1078780d
  litengwei authored Dec 09, 2022
  
  1078780d
- 解决冲突 · f5ebc7f7
  tangwei authored Dec 09, 2022
  
  f5ebc7f7
- 修改bnug · 88318956
  tangwei authored Dec 09, 2022
  
  88318956
- Merge branch 'develop_dl_plan6_temp' of… · 325715eb
  chenzhao authored Dec 09, 2022
```
Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp
```
  325715eb
- 修改人员代码 · 1721aa2d
  chenzhao authored Dec 09, 2022
  
  1721aa2d
- 12910 · ee78bc96
  tianyiming authored Dec 09, 2022
  
  ee78bc96
08 Dec, 2022 22 commits
- 修改切面 · 3e191844
  tianyiming authored Dec 08, 2022
  
  3e191844
- Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp · c61d6579
  KeYong authored Dec 08, 2022
  
  c61d6579
- 修改测试发现的bug · 3d7b82ec
  KeYong authored Dec 08, 2022
  
  3d7b82ec
- 增加当前登陆人接口 · bccdd858
  chenzhao authored Dec 08, 2022
  
  bccdd858
- 修改bug · a18d7f43
  tangwei authored Dec 08, 2022
  
  a18d7f43
- 增加脚本 · aa249da0
  tangwei authored Dec 08, 2022
  
  aa249da0
- Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp · b1939033
  KeYong authored Dec 08, 2022
  
  b1939033
- 修改bug · ef7a86b5
  KeYong authored Dec 08, 2022
  
  ef7a86b5
- 增加脚本 · 3a2a5ba1
  tangwei authored Dec 08, 2022
  
  3a2a5ba1
- 修改bug · e9e9be96
  tangwei authored Dec 08, 2022
  
  e9e9be96
- app 增加默认仓库 · 7a44fe74
  tangwei authored Dec 08, 2022
  
  7a44fe74
- 解决入库乱码bug · b7a33fef
  lisong authored Dec 08, 2022
  
  b7a33fef
- 重点部位耐火性质使用性质修改前端传值错误 · 288fa411
  chenzhao authored Dec 08, 2022
  
  288fa411
- Merge branch 'develop_dl_plan6_temp' of… · 7de1f492
  chenzhao authored Dec 08, 2022
```
Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp
```
  7de1f492
- 巡检统计巡检点过滤换流站 · a9e3ba90
  chenzhao authored Dec 08, 2022
  
  a9e3ba90
- 代码提交 · 15790e71
  zhangsen authored Dec 08, 2022
  
  15790e71
- 解决冲突 · d6d9b143
  tangwei authored Dec 08, 2022
  
  d6d9b143
- 修改不过，告警名称 · 5b04d9c5
  tangwei authored Dec 08, 2022
  
  5b04d9c5
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp · 72d74be4
  tianyiming authored Dec 08, 2022
  
  72d74be4
- Merge remote-tracking branch 'origin/develop_dl_3.6.0.6' into develop_dl_plan6 · 4808fe99
  tianyiming authored Dec 08, 2022
```
# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
```
  4808fe99
- 修改bug · 0472be9c
  tianyiming authored Dec 08, 2022
  
  0472be9c
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp · e89cb162
  tianyiming authored Dec 08, 2022
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml
```
  e89cb162
07 Dec, 2022 4 commits

Merge remote-tracking branch 'origin/develop_dl_3.6.0.6' into develop_dl_plan6 · 9af94060

authored Dec 07, 2022

# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IBuilldService.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

9af94060

消防视图建筑树和系统树添加权限 · 2b3c072b
tianyiming authored Dec 07, 2022

2b3c072b
bug · b1ef8b88
zhangsen authored Dec 07, 2022

b1ef8b88
bug · a80343eb
zhangsen authored Dec 07, 2022

a80343eb