From e8be76a40ae0b3cb1d37a6e91e25c1284a50347f Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期四, 21 九月 2023 20:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/BL/Type_OrderLockLog/Attribute_IsLocked#2.qbl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/_Main/BL/Type_OrderLockLog/Attribute_IsFirmed\0432.qbl" "b/_Main/BL/Type_OrderLockLog/Attribute_IsLocked\0432.qbl"
similarity index 87%
rename from "_Main/BL/Type_OrderLockLog/Attribute_IsFirmed\0432.qbl"
rename to "_Main/BL/Type_OrderLockLog/Attribute_IsLocked\0432.qbl"
index 7594124..05d9136 100644
--- "a/_Main/BL/Type_OrderLockLog/Attribute_IsFirmed\0432.qbl"
+++ "b/_Main/BL/Type_OrderLockLog/Attribute_IsLocked\0432.qbl"
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
 #parent: #root
-Attribute IsFirmed
+Attribute IsLocked
 {
   #keys: '3[412960.0.217504477][412960.0.217504476][412960.0.217504478]'
   ValueType: Boolean

--
Gitblit v1.9.3