fix local merge conflicts in req ctrl
This commit is contained in:
parent
a5152aaa3d
commit
cbaec13d38
|
@ -98,7 +98,7 @@ public class RequestController {
|
|||
return "shop/search";
|
||||
}
|
||||
|
||||
@GetMapping("/shop/checkout")
|
||||
/* @GetMapping("/shop/checkout")
|
||||
public String shopCheckout(HttpSession session, HttpServletRequest request) {
|
||||
session.setAttribute("afterLogin", request.getRequestURI());
|
||||
return "shop/checkout";
|
||||
|
@ -112,7 +112,7 @@ public class RequestController {
|
|||
@GetMapping("/shop/checkoutFinish")
|
||||
public String shopCheckoutFinishGET() {
|
||||
return "shop/checkoutFinish";
|
||||
}
|
||||
}*/
|
||||
|
||||
// @GetMapping("/shop/articles/{id}")
|
||||
// public String shopArticlesById() {
|
||||
|
|
Reference in New Issue