xiaoSu
3c1b9cef33
# Conflicts: # zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteVehicleService.java # zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteVehicleFallbackFactory.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java # zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java |
||
|---|---|---|
| .. | ||
| zhilian-business | ||
| zhilian-file | ||
| zhilian-gen | ||
| zhilian-job | ||
| zhilian-manager | ||
| zhilian-online | ||
| zhilian-resolver | ||
| zhilian-system | ||
| pom.xml | ||