Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev

src/components/tableList.vue

@@ -176,6 +176,9 @@
               @change="blurBackData(scope.row)"
             ></el-input-number>
           </div>
+          <div v-else-if="item.scope === 'copyTime' && scope.row[item.prop] != null" v-for="(item, index) in scope.row['copyTime']" :key="index">
+            <span >{{item}}</span>
+          </div>
           <span
             v-else-if="item.scope === 'status' && scope.row[item.prop] != null"
             >{{

src/views/Marketing/goods/commodityManageMent/index.vue

@@ -395,6 +395,12 @@ export default {
           hidden: true,
           scope: "status",
         },
+        {
+          label: "同步时间",
+          prop: "copyTime",
+          hidden: true,
+          scope: "copyTime",
+        },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条