diff --git a/src/main/java/com/youlai/boot/system/controller/UserOnlineController.java b/src/main/java/com/youlai/boot/system/controller/UserOnlineController.java
index d0333150..91bf1a0c 100644
--- a/src/main/java/com/youlai/boot/system/controller/UserOnlineController.java
+++ b/src/main/java/com/youlai/boot/system/controller/UserOnlineController.java
@@ -1,6 +1,6 @@
 package com.youlai.boot.system.controller;
 
-import com.youlai.boot.common.result.Result;
+import com.youlai.boot.core.web.Result;
 import com.youlai.boot.system.service.UserOnlineService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -52,4 +52,4 @@ public class UserOnlineController {
                 "count", userOnlineService.getOnlineUserCount()
         ));
     }
-} 
\ No newline at end of file
+} 
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
index a2a04c6f..2573b4d3 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
@@ -116,11 +116,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
             throw new BusinessException("字典不存在");
         }
         // 校验 code 是否唯一
-<<<<<<< HEAD
-        String dictCode = dictForm.getCode();
-=======
         String dictCode = dictForm.getDictCode();
->>>>>>> 95412501fc69777ad7db6fef970b479c9651984d
         if (!entity.getDictCode().equals(dictCode)) {
             long count = this.count(new LambdaQueryWrapper<Dict>()
                     .eq(Dict::getDictCode, dictCode)
@@ -130,9 +126,6 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
         // 更新字典
         Dict dict = dictConverter.toEntity(dictForm);
         dict.setId(id);
-<<<<<<< HEAD
-        return this.updateById(dict);
-=======
         boolean result = this.updateById(dict);
         if (result) {
             // 更新字典数据
@@ -152,7 +145,6 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
             }
         }
         return result;
->>>>>>> 95412501fc69777ad7db6fef970b479c9651984d
     }
 
     /**