• chenzhao's avatar
    Merge branch 'dev0124' of http://36.40.66.175:5000/moa/amos-boot-biz into dev0124 · d9eef832
    chenzhao authored
    # Conflicts:
    #	amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java
    #	amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.xml
    #	amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java
    d9eef832
MaintenanceMapper.xml 3.73 KB