Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/logistics/details/index.vue

@@ -143,6 +143,10 @@
             label:'经销商简称',
             value:this.mainData.enterprisename
           },
+          {
+            label:'备注',
+            value:this.mainData.remarks
+          },
         ]
       },
       // 监听切换数据,上一页,下一页

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -1,5 +1,6 @@
 <template>
 <div class="container normal-panel">
+  <span style="font-size:12px;color:#3874f6;text-decoration: underline;cursor: pointer;" @click="$router.back()">返回</span>
   <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
   <div class="product-detail container flex-align-stretch" style="width: 100%">
     <div>
@@ -277,5 +278,6 @@ export default {
   color: #5a73d3;
   font-size: 15px;
   /*font-weight: bold;*/
+  
 }
 </style>