Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/purchasingManage/inquiryManage/components/addDialog.vue

@@ -450,6 +450,7 @@ export default {
         item['resultList'].forEach((val) => {
           val['remark'] = '';
           val.supplierName = item.name;
+          val.isWinner = 1;
         });
 
         let supplierIndex = supplierIds.indexOf(item.supplierId)

src/views/saleManage/contact/index.vue

@@ -334,6 +334,14 @@ export default {
           minWidth: 120,
           slot: 'enterpriseScale'
         },
+        {
+          prop: 'followThroughTime',
+          label: '最近跟进时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120,
+        },
+        
         {
           prop: 'enterpriseHonor',
           label: '企业荣誉',