Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-09-12 d5617613387568c995727e944f981b2ca8910903

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue

@@ -234,6 +234,9 @@
          }else if(orderId.value!=null){
            router.push({path: '/main/delivery/createDelivery', query: {orderId: orderId.value}})
            break
          }else {
            router.push({path: '/main/delivery/selectDelivery'})
            break
          }