From 298a2eaf87f08df7472c49079f1ad54b07672e05 Mon Sep 17 00:00:00 2001
From: myh <white2021@foxmail.com>
Date: Thu, 26 Oct 2023 11:33:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/springdemo/controller/MerchantsController.java   | 4 ++--
 .../com/example/springdemo/controller/UsersController.java   | 2 +-
 .../com/example/springdemo/service/MerchantsService.java     | 5 ++---
 .../com/example/springdemo/service/MerchantsServiceImpl.java | 2 +-
 .../java/com/example/springdemo/service/UsersService.java    | 5 ++---
 .../com/example/springdemo/service/UsersServiceImpl.java     | 5 ++---
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/springdemo/controller/MerchantsController.java b/src/main/java/com/example/springdemo/controller/MerchantsController.java
index 30d1a39..d6e0a1c 100644
--- a/src/main/java/com/example/springdemo/controller/MerchantsController.java
+++ b/src/main/java/com/example/springdemo/controller/MerchantsController.java
@@ -16,7 +16,7 @@ public class MerchantsController {
 
     @PostMapping("/add")
     public Merchants saveMerchants(@RequestBody Merchants merchants) {
-        return merchantsService.insetMerchants(merchants);
+        return merchantsService.addMerchants(merchants);
     }
 
     @DeleteMapping("/delete/{id}")
@@ -30,7 +30,7 @@ public class MerchantsController {
     }
 
     @GetMapping("/find")
-    public List<Merchants> getMerchants() {
+    public Iterable<Merchants> getMerchants() {
         return merchantsService.findAllMerchants();
     }
 
diff --git a/src/main/java/com/example/springdemo/controller/UsersController.java b/src/main/java/com/example/springdemo/controller/UsersController.java
index 1f87919..982e790 100644
--- a/src/main/java/com/example/springdemo/controller/UsersController.java
+++ b/src/main/java/com/example/springdemo/controller/UsersController.java
@@ -16,7 +16,7 @@ public class UsersController {
 
     @PostMapping("/add")
     public Users saveUsers(@RequestBody Users users) {
-        return usersService.insetUsers(users);
+        return usersService.addUsers(users);
     }
 
     @DeleteMapping("/delete/{id}")
diff --git a/src/main/java/com/example/springdemo/service/MerchantsService.java b/src/main/java/com/example/springdemo/service/MerchantsService.java
index ef3b502..f9f3bd9 100644
--- a/src/main/java/com/example/springdemo/service/MerchantsService.java
+++ b/src/main/java/com/example/springdemo/service/MerchantsService.java
@@ -2,17 +2,16 @@ package com.example.springdemo.service;
 
 import com.example.springdemo.entities.Merchants;
 
-import java.util.List;
 import java.util.Optional;
 
 public interface MerchantsService {
-    Merchants insetMerchants(Merchants merchant);
+    Merchants addMerchants(Merchants merchant);
 
     void deleteMerchantsById(Long id);
 
     Merchants updateMerchants(Merchants merchant);
 
-    List<Merchants> findAllMerchants();
+    Iterable<Merchants> findAllMerchants();
 
     Optional<Merchants> findById(Long id);
 
diff --git a/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java b/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java
index da5d3de..90a831e 100644
--- a/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java
+++ b/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java
@@ -14,7 +14,7 @@ public class MerchantsServiceImpl implements MerchantsService {
     private MerchantsRepository merchantsRepository;
 
     @Override
-    public Merchants insetMerchants(Merchants merchant) {
+    public Merchants addMerchants(Merchants merchant) {
         return merchantsRepository.save(merchant);
     }
 
diff --git a/src/main/java/com/example/springdemo/service/UsersService.java b/src/main/java/com/example/springdemo/service/UsersService.java
index 6c5baaf..c8155bf 100644
--- a/src/main/java/com/example/springdemo/service/UsersService.java
+++ b/src/main/java/com/example/springdemo/service/UsersService.java
@@ -2,18 +2,17 @@ package com.example.springdemo.service;
 
 import com.example.springdemo.entities.Users;
 
-import java.util.List;
 import java.util.Optional;
 
 public interface UsersService {
 
-    Users insetUsers(Users user);
+    Users addUsers(Users user);
 
     void deleteUsersById(Long id);
 
     Users updateUsers(Users user);
 
-    List<Users> findAllUsers();
+    Iterable<Users> findAllUsers();
 
     Optional<Users> findById(Long id);
 
diff --git a/src/main/java/com/example/springdemo/service/UsersServiceImpl.java b/src/main/java/com/example/springdemo/service/UsersServiceImpl.java
index 7303fee..7faa640 100644
--- a/src/main/java/com/example/springdemo/service/UsersServiceImpl.java
+++ b/src/main/java/com/example/springdemo/service/UsersServiceImpl.java
@@ -5,7 +5,6 @@ import com.example.springdemo.entities.Users;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -14,7 +13,7 @@ public class UsersServiceImpl implements UsersService {
     private UsersRepository usersRepository;
 
     @Override
-    public Users insetUsers(Users user) {
+    public Users addUsers(Users user) {
         return usersRepository.save(user);
     }
 
@@ -29,7 +28,7 @@ public class UsersServiceImpl implements UsersService {
     }
 
     @Override
-    public List<Users> findAllUsers() {
+    public Iterable<Users> findAllUsers() {
         return usersRepository.findAll();
     }