Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

# Conflicts:
#	apps/web-antd/vite.config.mts

apps/web-antd/src/views/sis/accessControl/device/data.ts

@@ -84,10 +84,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '外部编码',
     field: 'outCode',
   },
-  {
-    title: '绑定设备',
-    field: 'bindDeviceIp',
-  },
   {
     field: 'action',
     fixed: 'right',

apps/web-antd/src/views/sis/personLib/data.ts

@@ -11,17 +11,7 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'libName',
-    label: '人员库名称',
+    label: '库名称',
-  },
-
-  {
-    component: 'Select',
-    componentProps: {
-      getPopupContainer,
-      options: getDictOptions(DictEnum.SIS_LIB_TYPE),
-    },
-    fieldName: 'libType',
-    label: '库类型',
   },
 ];
 
@@ -42,15 +32,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '人员库描述',
     field: 'libDesc',
   },
-  {
-    title: '库类型',
-    field: 'libType',
-    slots: { default: 'libType' },
-  },
-  /* {
-    title: '业务类型',
-    field: 'busiType',
-  },*/
   {
     field: 'action',
     fixed: 'right',
@@ -71,7 +52,7 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '人员库名称',
+    label: '库名称',
     fieldName: 'libName',
     component: 'Input',
     rules: 'required',

apps/web-antd/src/views/sis/personLibImg/data.tsx

@@ -157,7 +157,7 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     label: '人像图片',
-    fieldName: 'imgUrl',
+    fieldName: 'imgOssId',
     component: 'ImageUpload',
     componentProps: {
       // accept: 'image/*', // 可选拓展名或者mime类型 ,拼接

apps/web-antd/vite.config.mts

@@ -27,7 +27,8 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://192.168.1.101:8080',
+            // target: 'http://192.168.43.169:8080',
+            target: 'http://192.168.110.207:8080',
             // target: 'http://192.168.0.108:8080',
             // target: 'http://192.168.0.106:8080',
             // target: 'http://47.109.37.87:3010',