Merge remote-tracking branch 'origin/knowledgePlat' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -374,7 +374,7 @@
                 let obj = [];
                 this.subGroups.map((item,i)=>{
                     item&&item.map((it)=>{
-                       obj.push({...it,groupType:i});
+                       obj.push({...it,groupType:i+1});
                    })
                 });
                 return obj