Merge branch 'develop' into devTee

src/modules/01_metadataNew/components/calendar/calendarMain.vue

@@ -74,7 +74,7 @@
             <q-icon
               name="mdi-plus"
               size="25px"
-              color="grey-7"
+              color="primary"
               @click="addCalendar()"
             />
             <q-tooltip>เพิ่มวันหยุด</q-tooltip>
@@ -84,7 +84,7 @@
             <q-icon
               name="mdi-content-copy"
               size="22px"
-              color="grey-7"
+              color="blue-6"
               @click="copyCalendar()"
             />
             <q-tooltip>คัดลอกวันหยุด</q-tooltip>