Merge branch 'master' into positec

king

2023-10-26 742f7d11557526038d332e60a8c8ca18177bc4e4

 src/templates/sharecomponent/columncomponent/index.jsx

@@ -4,7 +4,7 @@
import { Modal, notification, Switch, message } from 'antd'
import { CopyOutlined } from '@ant-design/icons'

import { getColumnForm } from '@/templates/zshare/formconfig'
import { getColumnForm } from './formconfig'

import ColumnForm from './columnform'
import ColspanForm from './colspanform'