解决冲突

2a5c403c · aifen@azjy1.onexmail.com · 181687dd · 5400418d · 2a5c403c · 2a5c403c
Commit 2a5c403c authored Jul 06, 2022 by aifen@azjy1.onexmail.com
10 changed files
--- a/src/pages/SchoolReport/SchoolReport.vue
+++ b/src/pages/SchoolReport/SchoolReport.vue
--- a/src/static/images/breakfastTimeBg.png
+++ b/src/static/images/breakfastTimeBg.png
--- a/src/static/images/consumeOpenbgm.png
+++ b/src/static/images/consumeOpenbgm.png
--- a/src/static/images/consumerAdvice.png
+++ b/src/static/images/consumerAdvice.png
--- a/src/static/images/consumerRationality.png
+++ b/src/static/images/consumerRationality.png
--- a/src/static/images/mealPal.png
+++ b/src/static/images/mealPal.png
--- a/src/static/images/noAttendanceReportDatailData.png
+++ b/src/static/images/noAttendanceReportDatailData.png
--- a/src/static/images/progress.png
+++ b/src/static/images/progress.png
--- a/src/static/images/progressIcon.png
+++ b/src/static/images/progressIcon.png
--- a/src/static/images/timeTrends.png
+++ b/src/static/images/timeTrends.png