From c0286cc99defaac2e930cf9b7834c015e81fbbe5 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 05 十二月 2024 10:44:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def b/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def
index 2a9fd54..1e427fd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"浜х嚎","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"鐝鍚嶇О","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SingleShiftName","title":"鍗曠彮娆″悕绉�","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SingleShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StandardYield","title":"鏍囧噯浜ч噺","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StandardYield"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"浜х嚎","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"鐝鍚嶇О","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FirstSingleShiftQuantity","title":"鐧界彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"FirstSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SecondSingleShiftQuantity","title":"浜岀彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SecondSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ThirdSingleShiftQuantity","title":"涓夌彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ThirdSingleShiftQuantity"}}]'
         ContextMenu: 'listContextMenuSingleShiftConfig'
         Taborder: 2
       ]

--
Gitblit v1.9.3