Commit 9cd9ac1b authored by 霍传世's avatar 霍传世

解决合并冲突

parent efddbf6a
Pipeline #253 failed with stages
...@@ -8,6 +8,4 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -8,6 +8,4 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/businessApi") @RequestMapping("/businessApi")
public class businessController { public class businessController {
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment