diff --git a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar index 57fd706..8362b57 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar differ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java index 3d6abf5..aa157d3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java @@ -140,9 +140,9 @@ public class OrderPage { private java.lang.String logisticsId; /**状态,0:待付款 默认,1:待发货,2:已发货,3:完结,4:退换货*/ - @Excel(name = "状态,0:待付款 默认,1:待发货,2:已发货,3:完结,4:退换货,5:取消,6:待确认", width = 15, dicCode = "state") - @Dict(dicCode = "state") - @ApiModelProperty(value = "状态,0:待付款,1:待发货,2:已发货,3:完结,4:退换货,5:取消,6:待确认") + @Excel(name = "状态,0:待付款 默认,1:待发货,2:已发货,3:完结,4:退换货", width = 15, dicCode = "orderState") + @Dict(dicCode = "orderState") + @ApiModelProperty(value = "状态,0:待付款 默认,1:待发货,2:已发货,3:完结,4:退换货") private java.lang.Integer state; /**备注*/ @Excel(name = "备注", width = 15)