merge 2020-12-31

king

2020-12-31 32b84012bb8e2f05295c4237d17224700b149c8f

 src/views/billprint/index.scss

@@ -22,3 +22,7 @@
    top: calc(40vh + 70px);
  }
}

.normal-custom-table .main-pickup {
  display: none!important;
}