1

2 years ago · 970390e0e9
parent d419756dac
commit 970390e0e9
1 changed files with 0 additions and 3 deletions
--- 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 = "绑卡")