1. 09 Mar, 2022 2 commits
    • KeYong's avatar
      Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station · 42c689c3
      KeYong authored
      # Conflicts:
      #	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquiplistSpecificBySystemVO.java
      #	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/VideoDownloadVO.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/VideoController.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoMapper.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/BuildingServiceImpl.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/VideoServiceImpl.java
      #	amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
      #	amos-boot-system-equip/src/main/resources/mapper/Building.xml
      #	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
      #	amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml
      42c689c3
    • KeYong's avatar
      更新删除装备大屏不刷新问题 · 1b9b06c7
      KeYong authored
      1b9b06c7
  2. 08 Mar, 2022 3 commits
  3. 07 Mar, 2022 1 commit
  4. 04 Mar, 2022 13 commits
  5. 03 Mar, 2022 6 commits
  6. 02 Mar, 2022 4 commits
  7. 01 Mar, 2022 11 commits