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

chenlu

2024-07-17 59958f4c35abc1ae902a87dfb56f6dbadd36ad49

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

@@ -137,13 +137,14 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  margin-left: 5px;
  width: 400px;
}

#entirety{
  text-align: center;
  width: 50%;
  height: 105px;
  height: 140px;
  border: black 1px;
}

.row1 {