Skip to content

A
amos-boot-zx-biz
Switch branch/tag
  1. 20 May, 2024 2 commits
  3. 17 May, 2024 9 commits
  5. 16 May, 2024 1 commit
  7. 15 May, 2024 1 commit
  9. 13 May, 2024 3 commits
  11. 11 May, 2024 2 commits
  13. 10 May, 2024 2 commits
  15. 09 May, 2024 8 commits
  17. 08 May, 2024 8 commits
  19. 07 May, 2024 2 commits
  21. 06 May, 2024 2 commits
    • 吴江's avatar
      Merge branch 'dev0124' into 'developer' · 6d11a1ea
      吴江 authored 
      Dev0124

See merge request moa/amos-boot-biz!21
      6d11a1ea
    • 吴江's avatar
      Merge branch 'developer' into 'dev0124' · 03a22d5b
      吴江 authored 
      # Conflicts:
#   amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IJpStationService.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
#   amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
#   amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
#   amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
      03a22d5b