Merge branch 'develop' into 'test'

src/pages/index/index.tsx

@@ -179,6 +179,7 @@ class Index extends Component {
         }
         if (deviceInfoResponse) {
           updateDeviceData(deviceInfoResponse);
+          updateDeviceData({originCode: equipmentNum});
         } else {
           resetDeviceData();
         }

src/pages/pay/pay.tsx

@@ -61,7 +61,7 @@ class Pay extends Component {
     const { payId } = this.state;
     if (payId) {
       getPayOrder({
-        equipmentNum: device.code,
+        equipmentNum: device.originCode,
         equipmentPos: device.position,
         payType: '2',
         serviceId: device.serviceId,

src/pages/scanEnter/scanEnter.tsx

@@ -162,6 +162,7 @@ class ScanEnter extends Component {
         }
         if (deviceInfoResponse) {
           updateDeviceData(deviceInfoResponse);
+          updateDeviceData({originCode: equipmentNum});
         } else {
           resetDeviceData();
         }

src/store/rootReducers/device.ts

 import Action from '../../types/Store/Actions';
-import { Device } from '../..//types/Device/Device';
+import { Device } from '../../types/Device/Device';
 
 export type DeviceState = StoreState<Device>;
 
 export const INITIAL_STATE = {
+  originCode: '',
   code: '',
   isCurrentUserUsed: 0,
   isOnline: 0,

src/types/Device/Device.ts

@@ -3,6 +3,7 @@ export type Rate = {
   name: string;
 };
 export type Device = {
+  originCode: string,
   code: string;
   isCurrentUserUsed: number;
   isOnline: number;