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

chenlu

2024-09-24 edc227277159601c5cb86829f1c5ce14cf7903a4

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue

@@ -161,7 +161,7 @@
  height: 35px;
}
.row1 span {
  font-size: 14pt;
  font-size: 15pt;
}

.row2 {