@@ -110,11 +110,7 @@ export default defineComponent({
show: false,
name: '全部',
id: ''
-<<<<<<< HEAD
- })
-=======
});
->>>>>>> dev
return () => {
return (
