Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-18 11bcbe08a52aa8f771234ffaedc9ef8c27833ccc

 src/views/business/productSamplingInfo/index.vue

@@ -316,7 +316,7 @@
      ],
      page: {
        total: 0,
        size: 10,
        size: 20,
        current: 1
      },
      tableData1: [],
@@ -362,7 +362,7 @@
      ],
      page1: {
        total: 0,
        size: 10,
        size: 20,
        current: 1
      },
      yearSampleDia: false, // 年度抽样