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