静态交易修改

src/views/Statics/Apf/views/Dbiapf/index.vue

@@ -51,13 +51,7 @@
 import Utils from "~/utils";
 import Apf, { Pattern } from "../../model/Apf.js";
 
-<<<<<<<< HEAD:src/views/Statics/Apf/views/Dbiapf/index.vue
 import ApfInfo from "./ApfInfo.vue";
-========
-<script>
-import Utils from '~/utils'
-import Oit, { Pattern } from '../../model/Oit.js'
->>>>>>>> 45cbb57c3917ff55387e3cfc20096f30267b7cc4:src/views/Statics/Oit/views/Dbioit/index.vue
 
 import { queryById, add, edit, deleteById } from "~/service/test/apf.js";