Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/contest/controller/pc/merchant/MerchantController.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 @RequiredArgsConstructor
 @RestController
 @Tag(name = "商家管理API", description = "商家管理API")
-@RequestMapping("/pc/service/provider")
+@RequestMapping("/pc/merchant")
 public class MerchantController {
 
     private final MerchantLogic merchantLogic;