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

zhanghl

2025-04-27 0927a960d1cba395682d1992b8b0d70f39be2c2a

 src/views/basicData/calendar/index.vue

@@ -38,7 +38,7 @@
          plain
          icon="Plus"
          @click="handleAdd"
          v-hasPermi="['aps:calendar:update']"
          v-hasPermi="['aps:calendar:add']"
          >新增</el-button
        >
      </el-col>