Merge remote-tracking branch 'yudao/dev' into dev-new

# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
This commit is contained in:
puhui999
2025-05-20 17:56:53 +08:00
41 changed files with 866 additions and 1069 deletions

View File

@@ -15,6 +15,7 @@ export namespace InfraJobApi {
retryInterval: number;
monitorTimeout: number;
createTime?: Date;
nextTimes?: Date[];
}
}