Skip to content

A
amos-boot-biz
Switch branch/tag
  1. 26 Sep, 2024 6 commits
    • 李秀明's avatar
      Revert "平台登陆接口替换" · 6c7b7235
      李秀明 authored 
      This reverts commit 06e933ef
      6c7b7235
    • 李秀明's avatar
      Revert "tyboot升级 -> 1.1.25-DL-SNAPSHOT 与东东确认删除该排除代码" · e72b3616
      李秀明 authored 
      This reverts commit ae7a15a5.
      e72b3616
    • 李秀明's avatar
      Revert "tyboot升级 -> 1.1.25-DL-SNAPSHOT" · 6496a8b6
      李秀明 authored 
      This reverts commit 37a9ce85.
      6496a8b6
    • 李秀明's avatar
      Merge branch 'refs/heads/develop_dl' into develop_bugfix@dl · 7ef60dc7
      李秀明 authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
#	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/UnitTransformUtil.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
#	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/controller/KeyWordsInfoController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.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/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/EmergencyServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.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-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/PressurePumpServiceImpl.java
#	amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
      7ef60dc7
    • 李秀明's avatar
      Merge remote-tracking branch 'origin/develop_dl_bugfix_0723' into develop_dl_bugfix_0723 · ce18026f
      李秀明 authored
      ce18026f
    • 李秀明's avatar
      修改pom处理打包失败问题 · 9b94f8da
      李秀明 authored
      9b94f8da
  3. 25 Sep, 2024 2 commits
  5. 24 Sep, 2024 1 commit
  7. 23 Sep, 2024 9 commits
  9. 20 Sep, 2024 5 commits
  11. 19 Sep, 2024 11 commits
  13. 18 Sep, 2024 2 commits
  15. 14 Sep, 2024 2 commits
  17. 11 Sep, 2024 1 commit
  19. 09 Sep, 2024 1 commit