Merge remote-tracking branch 'origin/master'

jiangping

2024-12-06 e1552a4eb2699eb84c4e1419cb76b7beb4951c4a

 admin/src/components/business/OperaInternalCompanyWindow.vue

@@ -39,7 +39,7 @@
      // 表单数据
      form: {
        id: null,
        type: '2',
        type: '1',
        name: '',
        parentId: null,
        disable: false,