Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-12 3e241e58d4379f9b008db5ee3230214f0e642571

 src/components/makepager/TableCommonView.vue

@@ -394,12 +394,12 @@
        border-bottom: 0;
      }
    }
    li:last-child .name-view{
    li:last-child .name-view {
      border-bottom: none;
    }
    .no-product {
      height: 57px;
      line-height: 57px;
      height: 22px;
      line-height: 22px;
    }
  }
}