# Conflicts: # ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java # ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
# Conflicts: # ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java # ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java