From 71a86784c0ab4916dec1e5fd5e79f8b6d6b3a2d0 Mon Sep 17 00:00:00 2001 From: NH-LHG Date: Tue, 20 Jun 2023 15:52:04 +0800 Subject: [PATCH] =?UTF-8?q?[init]=E5=88=9B=E5=BB=BA=E8=83=BD=E8=BE=89erp?= =?UTF-8?q?=20=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/modules/demo/erp/entity/Order.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Order.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Order.java index c4b1ddb..4a6297b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Order.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Order.java @@ -138,9 +138,9 @@ public class Order implements Serializable { @ApiModelProperty(value = "派单备注") private java.lang.String dispacherRemark; /**状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货*/ - @Excel(name = "状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货", width = 15, dicCode = "orderState") - @Dict(dicCode = "orderState") - @ApiModelProperty(value = "状态,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：待确认") private java.lang.Integer state; /**备注*/ @Excel(name = "备注", width = 15)