Merge branch 'feature/v6.0/6.0.3' into feature/v6.0/6.0.4

chenyao

2025-09-25 6359f8067bf3bb48ca0613b92194eb7d14e0dea1

Merge branch 'feature/v6.0/6.0.3' into feature/v6.0/6.0.4

 src/views/tickets/orderLog.vue

@@ -861,7 +861,6 @@
import weekday from 'dayjs/plugin/weekday';
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
import { CircleClose, Promotion, Select } from '@element-plus/icons-vue';
import fqSvg  from '@/assets/images/fq.svg'

dayjs.extend(weekday);
dayjs.locale('zh-cn');