Merge branch 'dev-shuju' into test

src/views/modules/visual/communityParty/community.vue

@@ -143,7 +143,7 @@ export default {
         { title: "区域化党建单位名称", coulmn: 'unitName' },
         { title: "活动标题", coulmn: 'title' },
         { title: "活动地址", coulmn: 'address' },
-        { title: "服务事项", coulmn: 'serviceMatter' },
+        { title: "服务事项", coulmn: 'serviceMatterName' },
         { title: "服务人数", coulmn: 'peopleCount' },
         { title: "活动时间", coulmn: 'activityTime' }
       ],

src/views/modules/visual/components/screen-table/index.vue

@@ -254,6 +254,8 @@ export default {
         .td {
           text-align: center;
           width: calc(100% / 5);
+          box-sizing: border-box;
+          padding: 0 15px;
           cursor: pointer;
           overflow: hidden;
           white-space: nowrap;

src/views/modules/visual/measure/service.vue

@@ -179,7 +179,7 @@ export default {
         { title: "上报人", coulmn: 'reportUserName' },
         { title: "上报时间", coulmn: 'reportTime' },
         { title: "需求人", coulmn: 'demandUserName' },
-        { title: "服务方", coulmn: 'serviceName' },
+        { title: "服务方", coulmn: 'serviceShowName' },
         { title: "服务时间", coulmn: 'wantServiceTime' },
       ],
       categoryList: [],