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

chenlu

2024-11-04 c8c20aa81b009552c9a4aa3f3f0a8a94af00ae9e

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

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -434,7 +434,7 @@
    }
  })
  if(trademarkAttr.value.trademark===company.icon){
    trademarkAttr.value.yMargin=66
    trademarkAttr.value.xMargin=66
  }

}