Merge branch 'develop' into 'test'

src/containers/Equipment/EquipmentTest.js

@@ -67,6 +67,7 @@ class EquipmentTest extends Component {
         const result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
         var bar = result.indexOf("https://www.dcrym.com")!==-1?result.slice(29):result;
         bar = bar.length>8?bar.substring(0,8):bar;
+        DeviceCode = bar;
         this.setState({
           deviceCode: bar,
         });