Merge branch 'develop' into 'test'

src/containers/Equipment/EquipmentTest.js

@@ -145,8 +145,9 @@ class EquipmentTest extends Component {
             <i className='inputIcon'>
               <img src={eqIcon} alt='' />
             </i>
-            <span className='ellipsis inputText'>
+            {/* <span className='ellipsis inputText'>
               设备编号：
+            </span> */}
             <input
                 className='br8 listInput'
                 onChange={this.changeHandle}
@@ -155,7 +156,6 @@ class EquipmentTest extends Component {
                 maxLength='8'
                 value={deviceCode}
               />
-            </span>
           </div>
           <Button type='primary' className='scan' onClick={this.scanEquipment}>
             <div className='scanicon'>
@@ -171,7 +171,6 @@ class EquipmentTest extends Component {
             </i>
             <span>测试吹风</span>
           </div>
-        </div>
           <div className='linkItem' onClick={this.clickHandle}>
             <i className='linkIcon'>
               <img src={rateIcon} alt='' />
@@ -179,6 +178,7 @@ class EquipmentTest extends Component {
             <span>解绑键盘设备</span>
           </div>
         </div>
+      </div>
     );
   }
 }