• 吴江's avatar
    Merge branch 'develop_dl_plan6_temp' into 'fb_jxiop_V1.0.0_230202' · 62191e64
    吴江 authored
    # Conflicts:
    #   README.md
    #   amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
    #   amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java
    #   amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.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-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java
    62191e64
Name
Last commit
Last update
..
src/main Loading commit data...
.factorypath Loading commit data...
pom.xml Loading commit data...
sellPlan.pdf Loading commit data...