Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 b12ea16fa2d9440e9680127d126a4f3af450afd2

 src/components/makepager/TableCommonView.vue

@@ -238,10 +238,11 @@
                  if (!isNaN(value)) {
                    return prev + curr
                  } else {
                    return prev
                    return prev 
                  }
                }, 0)
                sums[index] = this.tableList.tableColumn[index - 1].unit + "" + sums[index]
                let unitIndex = this.tableList.tableColumn.findIndex(obj => obj.label === column.label);  
                sums[index]+=this.tableList.tableColumn[unitIndex].unit
              } else {
                sums[index] = ""
              }