Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/src/pages/manage/order/enquiry/ai_business_intelligence.js

@@ -90,7 +90,7 @@ export default class EnquiryLists extends Component {
         },
         {
           title: `${sldComLanguage("报告获取时间")}`,
-          dataIndex: "createTime",
+          dataIndex: "reportTime",
           align: "center",
           width: 100,
         },

xinkeaboard-admin/src/pages/member/vendor_lists.js

@@ -203,6 +203,12 @@ export default class VendorList extends Component {
           align: 'center',
           width: 100,
         },
+         {
+          title: `${sldComLanguage('商家ID')}`,//商家账号
+          dataIndex: 'vendorId',
+          align: 'center',
+          width: 100,
+        },
         {
           title: `${sldComLanguage('商家手机号')}`,//手机号
           dataIndex: 'vendorMobile',