Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2025-10-29 09:04:25 +08:00
4 changed files with 4 additions and 4 deletions

View File

@@ -746,7 +746,7 @@ import {
getAdviceBaseInfo,
getActivityBindDevice,
} from '../api';
import adviceBaseList from '../advicebaselist';
import adviceBaseList from '../adviceBaseList.vue';
import { computed, getCurrentInstance, nextTick, watch } from 'vue';
import { calculateQuantityByDays, formatNumber } from '@/utils/his';
import OrderGroupDrawer from './orderGroupDrawer';