From 91413a3e42e7df36207ece0c7908a7dbb9b8727a Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 30 五月 2024 17:07:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_Archive/StaticMethod_HandlePR.qbl |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl b/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
index 24d0b71..abd6fc9 100644
--- a/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
@@ -14,15 +14,15 @@
   TextBody:
   [*
     // 璇锋眰鍙傛暟
-    pathPR     := filePath + prFileName;
-    isArchive  := ifexpr( isPRArchive, "true", "false" );
-    isOverride := ifexpr( isOverwriteFile, "true", "false" );
-    minorKey   := [String]macroPlan.MDSID().MinorKey();
-    json       := JSON::Object()
-                  .Add( "pathPR", pathPR )
-                  .Add( "isArchive", isArchive )
-                  .Add( "isOverride", isOverride )
-                  .Add( "minorKey", minorKey ).Build().AsString();
+    pathPR       := filePath + prFileName;
+    isArchive    := ifexpr( isPRArchive, "true", "false" );
+    isOverride   := ifexpr( isOverwriteFile, "true", "false" );
+    macroPlanKey := [String]macroPlan.MDSID().MinorKey();
+    json         := JSON::Object()
+                    .Add( "pathPR", pathPR )
+                    .Add( "isArchive", isArchive )
+                    .Add( "isOverride", isOverride )
+                    .Add( "minorKey", macroPlanKey ).Build().AsString();
     
     // 鍐欏叆涓存椂鏂囦欢
     Archive::WriteTempFile( pathPR, prBinaryValue );

--
Gitblit v1.9.3