Skip to content

J
jiedao-api-boot-master
Commit e15785a4 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into release

parents e275c3aa bf1ba4b3
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderStatusMsgEnum.java
View file @ e15785a4
...@@ -28,6 +28,7 @@ public enum OrderStatusMsgEnum { ...@@ -28,6 +28,7 @@ public enum OrderStatusMsgEnum {
adjust_applying(5, 10112, 212, 0, "调仓中", "order.status.adjust", "order.status.adjust"), adjust_applying(5, 10112, 212, 0, "调仓中", "order.status.adjust", "order.status.adjust"),
ADJUST_WAREHOUSE(5, 10113, 215, 0, "调仓已到仓", "order.status.adjust.arrived.warehouse", "order.status.adjust.arrived.warehouse"), ADJUST_WAREHOUSE(5, 10113, 215, 0, "调仓已到仓", "order.status.adjust.arrived.warehouse", "order.status.adjust.arrived.warehouse"),
ADJUST_WAREHOUSE_PRE_INSTALLED(5, 10113, 215, 304, "调仓已到仓", "order.status.adjust.arrived.warehouse", "order.status.adjust.arrived.warehouse"),
EXIT_WAREHOUSE(5, 10114, 216, 0, "报关退场已入仓", "order.status.adjust.demobilized.warehoused", "order.status.warehousing"), EXIT_WAREHOUSE(5, 10114, 216, 0, "报关退场已入仓", "order.status.adjust.demobilized.warehoused", "order.status.warehousing"),
PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "已入仓", "order.status.warehousing", "order.status.warehousing"), PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "已入仓", "order.status.warehousing", "order.status.warehousing"),
// PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "预装中", "order.status.pre.install", "order.status.pre.install"), // PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "预装中", "order.status.pre.install", "order.status.pre.install"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment