feat: Handle merge errors

web_new/app/chat-context.tsx

@@ -38,6 +38,7 @@ interface IChatContext {
   };
   setCurrentDialogInfo: (val: { chat_scene: string; app_code: string }) => void;
   adminList: UserInfoResponse[];
+  refreshDialogList?: any;
 }
 
 function getDefaultTheme(): ThemeMode {
@@ -71,6 +72,7 @@ const ChatContext = createContext<IChatContext>({
   },
   setCurrentDialogInfo: () => {},
   adminList: [],
+  refreshDialogList: () => {},
 });
 
 const ChatContextProvider = ({ children }: { children: React.ReactElement }) => {

web_new/next.config.js

@@ -1,4 +1,5 @@
 /** @type {import('next').NextConfig} */
+const CopyPlugin = require('copy-webpack-plugin');
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 const path = require('path');
 const nextConfig = {