Merge remote-tracking branch 'origin/dev_ycq'

src/components/HolidayList.vue

@@ -165,8 +165,6 @@
 <script>
 // import {getholiday} from "@/api/holiday"
 import { getholiday } from '@/api/holiday'
-import { showholiday } from '@/api/holiday'
-import { timePanelSharedProps } from 'element-plus/es/components/time-picker/src/props/shared'
 import { saveholiday } from '@/api/holiday'
 export default {
 
@@ -325,7 +323,7 @@ export default {
     },
 }
 </script>
-<style>
+<style scoped>
 .demo-table-expand {
     font-size: 0;
 }