Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web

# Conflicts:
#	src/views/lowdesign/reportDesign/index.vue

src/views/Login/components/LoginForm.vue

@@ -206,7 +206,7 @@ const handleLogin = async (params) => {
       authUtil.removeLoginForm()
     }
     authUtil.setToken(res)
-  
+
     if (!redirect.value) {
       redirect.value = '/'
     }
@@ -217,7 +217,7 @@ const handleLogin = async (params) => {
         const queryParams = new URLSearchParams(window.location.search);
         const ticketUrl = queryParams.get('url'); // 获取查询参数值，例如 ?paramName=value 中的 value
         const accessToken  =authUtil.getAccessToken();
-      
+
         console.log(accessToken);
         if(ticketUrl!=null){
           

src/views/lowdesign/reportDesign/index.vue

@@ -354,6 +354,10 @@ const tableFormVerify = (type) => {
         let tabKey = 'mysql'
         // 子字段不能再包含子字段
         if (item.isSubField && item.hasChildren === 'Y') {
+<<<<<<< HEAD
+          
+=======
+>>>>>>> e33fcb33fe4b8f77c8e4cfa9784af83018966c04
           messageText = `<div style="line-height:24px">
               <div>子字段不能包含子字段</div>
               <div>序号：${index + 1}</div>