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

guoyuji

2024-07-12 f4e8f069d050293232cfe68ebd38b2b05c4ad4b4

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

@@ -175,10 +175,18 @@
  height: 25px;
  font-weight: bold;
  font-size: 15pt;
  margin-left: 40px;
}
.row1 span{
  font-size: 15pt;
}

.row2 span{
  font-size: 15pt;
}

.row5 span{
  font-size: 10pt;
  font-size: 15pt;
}

.row6 {