Merge branch 'master' into feature/Feature-return

src/components/Common/print-foshan.vue

@@ -216,8 +216,8 @@ export default {
 
   .print-table-1 {
     font-size: 14px;
-    margin-top: 20px;
-    margin-bottom: 40px;
+    margin-top: 10px;
+    margin-bottom: 10px;
     .el-row {
       margin-left: 0 !important;
       margin-right: 0 !important;
@@ -254,8 +254,8 @@ export default {
     }
     .foot {
       color: #333333;
-      margin-top: 20px;
-      border-right: 1px solid #EBEEF5;
+      margin-top: 10px;
+      // border-right: 1px solid #EBEEF5;
       .el-col {
         padding: 0;
         display: flex;