提交 8a10ea3f authored 作者: liuhaiquan's avatar liuhaiquan

Merge remote-tracking branch 'origin/v6.2_sync_trade_20231102' into test

...@@ -118,11 +118,7 @@ public enum OrderChildEnum { ...@@ -118,11 +118,7 @@ public enum OrderChildEnum {
Status.LOAD.getCode(), Status.LOAD.getCode(),
Status.GO_TO_RECEIVE.getCode(), Status.GO_TO_RECEIVE.getCode(),
Status.ARRIVE_RECEIVE.getCode(), Status.ARRIVE_RECEIVE.getCode(),
Status.UNLOAD.getCode(), Status.UNLOAD.getCode()
Status.DRIVER_CANCEL.getCode(),
Status.PLATFORM_CANCEL.getCode(),
Status.OWNER_CANCEL.getCode(),
Status.ARTIFICIAL_CANCEL.getCode()
); );
...@@ -164,7 +160,11 @@ public enum OrderChildEnum { ...@@ -164,7 +160,11 @@ public enum OrderChildEnum {
Status.LOAD.getCode(), Status.LOAD.getCode(),
Status.GO_TO_RECEIVE.getCode(), Status.GO_TO_RECEIVE.getCode(),
Status.ARRIVE_RECEIVE.getCode(), Status.ARRIVE_RECEIVE.getCode(),
Status.UNLOAD.getCode() Status.UNLOAD.getCode(),
Status.DRIVER_CANCEL.getCode(),
Status.PLATFORM_CANCEL.getCode(),
Status.OWNER_CANCEL.getCode(),
Status.ARTIFICIAL_CANCEL.getCode()
); );
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论