Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/views/elective/generation/components/elective-generation-table.vue

@@ -110,7 +110,7 @@ export default {
       // resolve core
       const prop = prefix + ext.generation + '_' + data.category
       const name = data.displayName
-      const shouldMerge = data.values.length != rowsRef.length || data.values.some(v => v.groupId == 0)
+      const shouldMerge = data.values.some(v => v.groupId == 0)
       if (data.queryCode) {
         let nextName = data.displayName
         if (overrideQueryName) nextName = overrideQueryName + '/' + nextName