Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/components/SelectButton/QrcodeType.jsx

@@ -52,7 +52,7 @@ const qrcodeType = props => {
         },
         {
             name: '在线选房',
-            value: 'salesBatch',
+            value: 'house',
             visible,
         },
     ]

src/pages/channel/newCustomer/index.jsx

@@ -119,7 +119,7 @@ const qrcodelist = props => {
             key: 'targetType',
             align: 'center',
         render: (text, record) => <span>{text == 'project' ? '项目' : text == 'activity' ? '常规活动'  : text == 'help' ? '助力活动'  : text == 'group' ? '拼团活动'
-        : text == 'h5' ? 'H5活动' : text == 'live' ? '直播活动': text == 'news' ? '资讯' : text == 'salesBatch' ? '销售批次' : ''}</span>,
+        : text == 'h5' ? 'H5活动' : text == 'live' ? '直播活动': text == 'news' ? '资讯' : text == 'house' ? '在线选房' : ''}</span>,
         },
         {
             title: '内容',