From 6b027c18660b828ec7b57ad0e3f4ffca9f4d14d1 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 03 十一月 2023 15:15:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/api/task.ts | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/api/task.ts b/src/api/task.ts
index 125883a..ca76d50 100644
--- a/src/api/task.ts
+++ b/src/api/task.ts
@@ -47,8 +47,8 @@
startTime: number
endTime: number
workHours: string
- inputMaterials: inputMaterial[]
- outputMaterials: inputMaterial[]
+ inputMaterials: Material[]
+ outputMaterials: Material[]
workers: Worker[]
allProcedureNames: string[]
channel: number
@@ -62,12 +62,11 @@
CurrentProcedureIndex: number
CanStarted: boolean
}
-export interface inputMaterial {
+export interface Material {
materialId: string
materialName: string
amount: number
unit: string
- background: string
date: string
}
--
Gitblit v1.8.0