Skip to content

Commit 5c86065

Browse files
committed
Merge branch 'dev2' into product2
2 parents b69dc64 + a81d5aa commit 5c86065

File tree

72 files changed

+1423
-973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1423
-973
lines changed

backend/src/main/java/com/smalltrend/controller/AiChatController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@RestController
1313
@RequestMapping("/api/ai")
1414
@RequiredArgsConstructor
15-
@CrossOrigin(origins = {"http://localhost:5173", "http://localhost:5174", "http://localhost:3000"})
15+
@CrossOrigin(origins = {"http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000"})
1616
public class AiChatController {
1717

1818
private final AiChatService aiChatService;

backend/src/main/java/com/smalltrend/controller/AuditLogController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@RestController
1515
@RequestMapping("/api/audit-logs")
1616
@RequiredArgsConstructor
17-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
17+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
1818
public class AuditLogController {
1919

2020
private final AuditLogService auditLogService;

backend/src/main/java/com/smalltrend/controller/CRM/CampaignController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@RestController
1616
@RequestMapping("/api/crm/campaigns")
1717
@RequiredArgsConstructor
18-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
18+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
1919
public class CampaignController {
2020

2121
private final CampaignService campaignService;

backend/src/main/java/com/smalltrend/controller/CRM/CouponController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@RestController
1616
@RequestMapping("/api/crm/coupons")
1717
@RequiredArgsConstructor
18-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
18+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
1919
public class CouponController {
2020

2121
private final CouponService couponService;

backend/src/main/java/com/smalltrend/controller/CRM/CustomerController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@RestController
1616
@RequestMapping("/api/crm")
1717
@RequiredArgsConstructor
18-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
18+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
1919
public class CustomerController {
2020

2121
private final CustomerService customerService;

backend/src/main/java/com/smalltrend/controller/CRM/CustomerTierController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@RestController
1313
@RequestMapping("/api/crm/tiers")
1414
@RequiredArgsConstructor
15-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
15+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
1616
public class CustomerTierController {
1717

1818
private final CustomerTierService customerTierService;

backend/src/main/java/com/smalltrend/controller/CRM/LoyaltyGiftController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@RestController
1717
@RequestMapping("/api/crm/loyalty-gifts")
1818
@RequiredArgsConstructor
19-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
19+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
2020
public class LoyaltyGiftController {
2121

2222
private final LoyaltyGiftService loyaltyGiftService;

backend/src/main/java/com/smalltrend/controller/CRM/TicketController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@RestController
2020
@RequestMapping("/api/crm")
2121
@RequiredArgsConstructor
22-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
22+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
2323
public class TicketController {
2424

2525
private final TicketService ticketService;

backend/src/main/java/com/smalltrend/controller/ReportController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@RestController
2020
@RequestMapping("/api/reports")
2121
@RequiredArgsConstructor
22-
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:3000" })
22+
@CrossOrigin(origins = { "http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000" })
2323
public class ReportController {
2424

2525
private final ReportService reportService;

backend/src/main/java/com/smalltrend/controller/SaleOrderController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@RestController
1919
@RequestMapping("/api/sale-orders")
2020
@RequiredArgsConstructor
21-
@CrossOrigin(origins = {"http://localhost:5173", "http://localhost:5174", "http://localhost:3000"})
21+
@CrossOrigin(origins = {"http://localhost:5173", "http://localhost:5174", "http://localhost:5175", "http://localhost:3000"})
2222
public class SaleOrderController {
2323

2424
private final SaleOrderService saleOrderService;

0 commit comments

Comments
 (0)