Merge branch 'dev' into vite

# Conflicts:
#	packages/IntelligentSecurity/AppISManage/AppISManage.vue
#	vue.config.js

project/oms/apps/AppArticles/components/Event.vue

@@ -108,7 +108,7 @@ export default {
       return [
         {prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v)},
         {prop: 'title', label: '标题', align: 'left'},
-        {prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center'},
+        {prop: 'createDate', label: '创建时间', dateFormat: 'YYYY-MM-DD', align: 'center'},
         {prop: 'createUser', label: '发布人', align: 'center'},
         {slot: 'options', label: '操作'}
       ]