Merge branch 'master' into csc

chengsc

2024-09-13 c75a630f7b099dfe3e5030a2cc66e96560cb9561

 Web/src/views/device/sortPallet/index.vue

@@ -119,7 +119,7 @@
const queryParams = ref<any>({});
const tableParams = ref({
    page: 1,
    pageSize: 10,
    pageSize: 20,
    total: 0,
});