merge: integrate latest main into FT546MWS algorithm test

ruoyi-ui/src/views/bas/traycode/index.vue

@@ -203,11 +203,10 @@
       <div v-for="item  in printData" :key="item.id" style="page-break-after:always" class="vue-easy-print">
         <vue-barcode
           :value=item.trayCode
-          format="CODE128"
-          width="4"
-          height="150"
+          format="CODE39"
+          width="2"
+          height="100"
           display-value
-          margin="5"
         />
       </div>
     </vue-easy-print>
@@ -464,11 +463,6 @@ export default {
   font-family: Arial, sans-serif;
 }
 
-.vue-qr {
-  display: block;
-  margin: 20px auto;
-  max-width: 100%;
-}
 
 @media print {
   @page {
@@ -481,7 +475,7 @@ export default {
   }
 
   .vue-easy-print {
-    padding: 20px;
+    padding: 5px;
   }
 
   .num {
@@ -489,8 +483,5 @@ export default {
     margin-top: 10px;
   }
 
-  .vue-qr {
-    margin: 10px auto;
-  }
 }
 </style>