合并冲突问题

src/pages/publishBall/index.tsx

@@ -6,8 +6,8 @@ import PublishForm from './publishForm'
 import { publishBallFormSchema } from '../../config/formSchema/publishBallFormSchema';
 import { PublishBallFormData } from '../../../types/publishBall';
 import PublishService from '@/services/publishService';
-import styles from './index.module.scss'
 import images from '@/config/images'
+import styles from './index.module.scss'
 
 const PublishBall: React.FC = () => {
   const [activityType, setActivityType] = useState<ActivityType>('individual')