From adb6ad94d8499fcaaca3a574f14764421861a601 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 12:02:34 +0800
Subject: [PATCH] 接口整理

---
 server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 365c204..0294c49 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -52,11 +52,6 @@
     @Autowired
     private MultifileMapper multifileMapper;
 
-<<<<<<< HEAD
-=======
-//    @Autowired
-//    private SystemDictDataBiz systemDictDataBiz;
->>>>>>> 05a9badaedf021d6b881de7cdb04c56cfd6d52cd
 
     @Override
     public String create(BikeRepair bikeRepair) {

--
Gitblit v1.9.3