Merge branch 'sowon' into develop

# Conflicts:
#	src/main/java/com/style24/front/biz/web/TsfMypageController.java

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -691,10 +691,10 @@ public class TsfMypageController extends TsfBaseController {
 	@PostMapping("/gift/use/confirm")
 	@ResponseBody
 	public GagaResponse getGiftcardUseConfirm(@RequestBody GiftCard giftcard) throws Exception {
-		
-		giftcardService.getGiftcardUseConfirm(giftcard);
 
 
+		giftcardService.getGiftcardUseConfirm(giftcard);
+
 		return super.ok(message.getMessage("SUCC_0001"));