From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/views/customerService/feedbackRegistration/index.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/views/customerService/feedbackRegistration/index.vue b/src/views/customerService/feedbackRegistration/index.vue
index 555dab5..40d99be 100644
--- a/src/views/customerService/feedbackRegistration/index.vue
+++ b/src/views/customerService/feedbackRegistration/index.vue
@@ -255,7 +255,7 @@
   },
   {
     label: "闂鎻忚堪",
-    prop: "disRes",
+    prop: "proDesc",
     width:300,
   },
   {
@@ -267,7 +267,6 @@
   {
     dataType: "action",
     label: "鎿嶄綔",
-    align: "center",
     fixed: 'right',
     operation: [
       {

--
Gitblit v1.9.3