From 29a163df36dd12960a8a8592d0b25b36def8cb53 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 10 七月 2023 23:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/BatchImport/index.vue |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index af1fcd4..b951e11 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -271,12 +271,14 @@
                 cloNamesList: item.cloNamesList,
                 oid: item.codeTemplateOid,
                 codeClassifyOid: item.codeClassifyOid,
+                codeRuleOid: item.codeRuleOid,
                 name: item.codeRuleVO.name
               }
             } else {
               return {
               ...item.codeClassifyTemplateVO,
               cloNamesList: item.cloNamesList,
+              codeClassifyOid: item.codeClassifyTemplateVO.codeclassifyoid
             };
             }
           });

--
Gitblit v1.9.3