diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
index 59f2e184..0fad205e 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
@@ -178,6 +178,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         User user = new User();
         user.setPassword(passwordEncoder.encode(resources.getPassword()));
         user.setUsername(resources.getAccount());
+        user.setNickName(resources.getShopName());
         user.setPhone(resources.getPhone());
         user.setCreateBy("admin");
         user.setEnabled(true);
@@ -240,6 +241,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         TbShopInfo tbShopInfo = tbShopInfoRepository.findById(resources.getId()).orElseGet(TbShopInfo::new);
         if (!resources.getShopName().equals(tbShopInfo.getShopName())) {
             shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString());
+            userRepository.updateNickName(resources.getAccount(),resources.getShopName());
         }
         ValidationUtil.isNull( tbShopInfo.getId(),"TbShopInfo","id",resources.getId());
         tbShopInfo.copy(resources);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java
index 5d5afe4b..779fa5af 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java
@@ -65,6 +65,10 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
     @Query(value = "update sys_user set enabled = 0 where  username = ?1",nativeQuery = true)
     void upEnableByusername(String username);
 
+    @Modifying
+    @Query(value = "update sys_user set nick_name = ?2  where username = ?1",nativeQuery = true)
+    void updateNickName(String username, String nickName);
+
     /**
      * 修改邮箱
      * @param username 用户名