From 94115127827b06d9bce21673726153f6fcce2aab Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Wed, 13 Mar 2024 17:33:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tenant/main/serve/index.vue | 24 ++++++++++++++++++------
 vue.config.js                         |  4 ++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index 65b1506..1338b17 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -751,17 +751,29 @@ export default {
         refreshBtn: false,
         height: '100',
         column: [{
+          label: '服务时间',
+          prop: 'createTime'
+        },{
+          label: '服务发起人',
+          prop: 'fromName'
+        },{
+          label: '服务对象',
+          prop: 'toName'
+        },{
+          label: '服务主题',
+          prop: 'serveTheme'
+        },{
+          label: '服务内容',
+          prop: 'serveContent'
+        },{
+          label: '附件备注',
+          prop: 'serveOther'
+        },{
           label: '备注1',
           prop: 'bak1'
         },{
           label: '备注2',
           prop: 'bak2'
-        },{
-          label: '备注3',
-          prop: 'bak3'
-        },{
-          label: '备注4',
-          prop: 'bak4'
         }]
       }
     },
diff --git a/vue.config.js b/vue.config.js
index 5946086..a62a9c8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,8 +24,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://localhost:8000', // 本地服务接口地址
-        target: "http://39.98.184.58:8000",  // 阿里云后台地址
-        // target: "http://192.168.3.108:8000",  // 本地
+        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        target: "http://192.168.3.104:8000",  // 本地
         // target: 'http://192.168.3.111:8000',
         ws: true,
         changeOrigin: true,

From fdd6d03a2541e6c84b5b42677220603986d3e79e Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Wed, 13 Mar 2024 17:35:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=8C=87=E5=90=91?=
 =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E6=9C=8D=E5=8A=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index a62a9c8..b1f6ebc 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,8 +24,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://localhost:8000', // 本地服务接口地址
-        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
-        target: "http://192.168.3.104:8000",  // 本地
+        target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        // target: "http://192.168.3.104:8000",  // 本地
         // target: 'http://192.168.3.111:8000',
         ws: true,
         changeOrigin: true,