From 4936ba718f4ec2d069a9c28d07215573ed8548aa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 10:12:10 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug

---
 admin/src/views/business/admissionStatistics.vue |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/business/admissionStatistics.vue b/admin/src/views/business/admissionStatistics.vue
index 3cc50cf..28f5f38 100644
--- a/admin/src/views/business/admissionStatistics.vue
+++ b/admin/src/views/business/admissionStatistics.vue
@@ -167,20 +167,12 @@
       getReportLists() {
         getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
           .then(res => {
-<<<<<<< HEAD
             if (!res || res.length === 0) {
-=======
-            if (res.length === 0) {
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
               this.column = []
               this.list = []
               return
             }
-<<<<<<< HEAD
               this.column = res[0]
-=======
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
-
               this.list = res.slice(1).map(row => {
                 const obj = {};
                 this.column.forEach((header, index) => {

--
Gitblit v1.9.3