Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java
#	src/main/java/com/example/gb/util/Result.java

pom.xml

@@ -48,6 +48,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.42</version>
             <optional>true</optional>
         </dependency>
         <dependency>

src/main/java/com/example/gb/controller/GoldbeanRechargeController.java

@@ -1,6 +1,6 @@
 package com.example.gb.controller;
 
-import com.example.gb.util.Result;
+//import com.example.gb.util.Result;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/admin/recharge")
 public class GoldbeanRechargeController {
     @GetMapping("sys/list")
-    public Result list(){
+    public String list(){
         return null;
     }
 }

src/main/java/com/example/gb/service/GoldBeanService.java

@@ -1,4 +0,0 @@
-package com.example.gb.service;
-
-public interface GoldBeanService {
-}

src/main/java/com/example/gb/service/GoldbeanRechargeService.java

@@ -0,0 +1,4 @@
+package com.example.gb.service;
+
+public interface GoldbeanRechargeService {
+}

src/main/java/com/example/gb/service/impl/GoldbeanRechargeServiceImpl.java

@@ -0,0 +1,8 @@
+package com.example.gb.service.impl;
+
+import com.example.gb.service.GoldbeanRechargeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GoldbeanRechargeServiceImpl implements GoldbeanRechargeService {
+}