Skip to content

A
amos-boot-biz
Switch branch/tag
  1. 13 Dec, 2022 8 commits
    • tianyiming's avatar
      更新liquibase · 7b3b33dc
      tianyiming authored
      7b3b33dc
    • KeYong's avatar
      更新 · 75f18c5e
      KeYong authored
      75f18c5e
    • KeYong's avatar
      Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 0889b12c
      KeYong authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
#	amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
      0889b12c
    • KeYong's avatar
      应急接口 · a57f56bc
      KeYong authored
      a57f56bc
    • lisong's avatar
      接口更新 · 0d88ddc8
      lisong authored
      0d88ddc8
    • tianyiming's avatar
      直流中心接口修改 · 83d81452
      tianyiming authored
      83d81452
    • suhuiguang's avatar
      1.空指针 · 88382075
      suhuiguang authored
      88382075
    • lisong's avatar
      更新 · 0e92bba5
      lisong authored
      0e92bba5
  3. 12 Dec, 2022 4 commits
  5. 08 Dec, 2022 2 commits
  7. 07 Dec, 2022 9 commits
    • tianyiming's avatar
      Merge remote-tracking branch 'origin/develop_dl_3.6.0.6' into develop_dl_plan6 · 9af94060
      tianyiming authored 
      # 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
    • tianyiming's avatar
      消防视图建筑树和系统树添加权限 · 2b3c072b
      tianyiming authored
      2b3c072b
    • zhangsen's avatar
      bug · b1ef8b88
      zhangsen authored
      b1ef8b88
    • zhangsen's avatar
      bug · a80343eb
      zhangsen authored
      a80343eb
    • tianyiming's avatar
      Merge remote-tracking branch 'origin/develop_dl_3.6.0.6' into develop_dl_plan6 · d382da5a
      tianyiming authored 
      # Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
      d382da5a
    • lisong's avatar
      现场问题修改 · f603df7f
      lisong authored
      f603df7f
    • tianyiming's avatar
      Merge remote-tracking branch 'origin/develop_dl_3.6.0.6' into develop_dl_plan6 · c15a98d5
      tianyiming authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
#	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
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
      c15a98d5
    • tianyiming's avatar
      Merge branch 'develop_dl_3.6.0.6' into develop_dl_plan6 · ced5d28e
      tianyiming authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
#	amos-boot-system-equip/src/main/resources/application-dev.properties
      ced5d28e
    • tianyiming's avatar
      12819、12818 · 907476e8
      tianyiming authored
      907476e8
  9. 06 Dec, 2022 3 commits
  11. 05 Dec, 2022 2 commits
  13. 03 Dec, 2022 1 commit
  15. 02 Dec, 2022 8 commits
  17. 01 Dec, 2022 3 commits