Merge branch 'master' of https://gitee.com/vansfa/rt_adminUI

src/views/store/components/productOrder.vue

@@ -166,6 +166,11 @@
             <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</p>
           </template>
         </el-table-column>
+        <el-table-column label="商品组合编码" width="300" align="center">
+          <template slot-scope="scope">
+            <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
+          </template>
+        </el-table-column>
         <el-table-column label="商品名称" width="300" align="center">
           <template slot-scope="scope">
             <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>