Merge branch 'dev' into dev_tides

Crunchy

2025-03-17 0a26d58a3906b9e13946c7cb46fae51a0de98920

 src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue

@@ -113,7 +113,7 @@
  },
  methods: {
    getTableData() {
      getPageAcceptance(this.form).then(res => {
      getPageAcceptance({...this.form, ...this.page}).then(res => {
        this.tableData = res.data.records;
        this.page.total = res.data.total;
      })