Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-09-10 ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -322,6 +322,12 @@
  height: 30px;
}

@media print {
  @page {
    margin: 5mm 5mm 10mm 5mm;
  }
}