• 吴江'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
Name
Last commit
Last update
..
amos-boot-module-hygf-api Loading commit data...
amos-boot-module-hygf-biz Loading commit data...
amos-boot-module-jxiop-analyse-biz Loading commit data...
amos-boot-module-jxiop-api Loading commit data...
amos-boot-module-jxiop-bigscreen-biz Loading commit data...
amos-boot-module-jxiop-biz Loading commit data...
amos-boot-module-jxiop-das Loading commit data...
amos-boot-module-jxiop-monitor-biz Loading commit data...
amos-boot-module-jxiop-warn-biz Loading commit data...
pom.xml Loading commit data...