|
|
@@ -89,18 +89,10 @@ export enum FunCode {
|
|
|
|
|
|
SpotPresalePointPriceReq = 1441877, // 铁合金预售点价请求
|
|
|
SpotPresalePointPriceRsp = 1441878, // 铁合金预售点价响应
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
- OrderReq = 196609, // 交易委托请求
|
|
|
- OrderRsp = 196610, // 交易委托应答
|
|
|
- CancelOrderReq = 196611, // 撤单请求
|
|
|
- CancelOrderRsp = 196612, // 撤单应答
|
|
|
-=======
|
|
|
- OrderReq = 196609, // 交易委托请求(0, 3, 1)
|
|
|
- OrderRsp = 196610, // 交易委托应答(0, 3, 2)
|
|
|
- CancelOrderReq = 196611, // 撤单请求(0, 3, 3)
|
|
|
- CancelOrderRsp = 196612, // 撤单应答(0, 3, 4)
|
|
|
- HolderCloseReq = 196713, // 按单平仓请求(196713)
|
|
|
- HolderCloseRsp = 196714, // 按单平仓应答(196714)
|
|
|
->>>>>>> 1b9fb171ddd0e07ff61b543bea2b15757d8433c7
|
|
|
+ OrderReq = 196609, // 交易委托请求(0, 3, 1)
|
|
|
+ OrderRsp = 196610, // 交易委托应答(0, 3, 2)
|
|
|
+ CancelOrderReq = 196611, // 撤单请求(0, 3, 3)
|
|
|
+ CancelOrderRsp = 196612, // 撤单应答(0, 3, 4)
|
|
|
+ HolderCloseReq = 196713, // 按单平仓请求(196713)
|
|
|
+ HolderCloseRsp = 196714, // 按单平仓应答(196714)
|
|
|
}
|
