Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/shipment-details/addShipDetDrawer.vue

@@ -564,6 +564,12 @@ export default {
           scopedSlots: { customRender: 'manualYarnProportion' },
           className: 'replacecolor'
         },
+{
+          title: '分组ID',
+          dataIndex: 'groupId',
+          width: 120,
+          className: 'replacecolor'
+        },
 
         {
           title: '操作',