解决合并冲突

openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue

@@ -25,7 +25,6 @@
 
 <script setup >
 import { ref, inject } from 'vue';
-import { FormInstance } from 'element-plus';
 
 // const form = inject('formState') as any;
 // const formRef = ref<FormInstance>();
@@ -49,7 +48,6 @@ const handleUpload = () => {
   border-radius: 4px;
   padding-left: 16px;
 
-
   :deep(.el-form) {
     display: flex;
     align-items: center;
@@ -83,9 +81,6 @@ const handleUpload = () => {
 
   .operate-btns {
     .main-btn {
-      // margin-left: 16px;
-      // width: 100px;
-
       &:first-child {
         margin-left: 0;
       }