From 970390e0e99bff1017921fa1918d9e9235c64430 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Tue, 3 Jan 2023 10:05:53 +0800
Subject: [PATCH] 1

---
 .../main/java/com/cweb/controller/HighUserCardController.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java b/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
index 3f233e45..31106d19 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
@@ -53,15 +53,12 @@ public class HighUserCardController {
     @Resource
     private HighUserService highUserService;
 
-<<<<<<< HEAD
-=======
     @Resource
     private HighUserPayPasswordService highUserPayPasswordService;
 
     @Resource
     private HighFleetOilCardService fleetOilCardService;
 
->>>>>>> activit
     @RequestMapping(value = "/bindCard", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "绑卡")