Merge remote-tracking branch 'origin/main' into lichang

src/views/system/log/login/index.vue

@@ -112,12 +112,12 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 150,
   },
-  {
-    title: t('views.system.log.login.loginLoc'),
-    dataIndex: 'loginLocation',
-    align: 'left',
-    width: 150,
-  },
+  // {
+  //   title: t('views.system.log.login.loginLoc'),
+  //   dataIndex: 'loginLocation',
+  //   align: 'left',
+  //   width: 150,
+  // },
   {
     title: t('views.system.log.login.os'),
     dataIndex: 'os',

src/views/system/log/operate/index.vue

@@ -656,8 +656,7 @@ onMounted(() => {
               :label="t('views.system.log.operate.operUser')"
               name="operName"
             >
-              {{ modalState.from.operName }} / {{ modalState.from.operIp }} /
-              {{ modalState.from.operLocation }}
+              {{ modalState.from.operName }} / {{ modalState.from.operIp }}
             </a-form-item>
           </a-col>
         </a-row>