合并s冲突

licp

2024-06-04 58420e1c44780e408ea62a4a8a275e4e52d108a2

 src/components/view/a6-personnel-overview.vue

@@ -166,7 +166,7 @@
        if(this.currentPage==1){
          this.loading = true
        }
        this.$axios.post(this.$api.user.selectUserList,{
        this.$axios.post(this.$api.user.selectPersonnelOverview,{
               page: {
            current: this.currentPage,
            size: this.pageSize