From 50b81a09016e0e532d58d90b2f6fb2e26f7d2758 Mon Sep 17 00:00:00 2001
From: NH-LHG <lhg0612@126.com>
Date: Tue, 20 Jun 2023 15:53:37 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"[init]=E5=88=9B=E5=BB=BA=E8=83=BD?=
 =?UTF-8?q?=E8=BE=89erp=20=E7=B3=BB=E7=BB=9F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 72a9c6cd
---
 .../target/jeecg-boot-base-tools-3.2.0.jar    | Bin 31002 -> 31002 bytes
 .../jeecg/modules/demo/erp/vo/OrderPage.java  |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

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 57fd7060c5e67f8f6ab66956ef0ecb2ad8bee80e..8362b57f0b5616305ab71b8bb814ee50cc6e9a13 100644
GIT binary patch
delta 714
zcmXZZODIH97zgk<_uOG-N~o(8A$d3DHO8|T&qDG@A(9a@xp!u+d9q?Hh0a1V8;@k6
zuoy~7p)5Riva&TB<x$GQ!rcFv)$jYh|2bdx5&0&OZ<5mALq(HLXVB^B;mt-$0oAY^
zQz6b<t_CxZLT$<_h#5|jS{Npk@R3wQDl|fyPy-i*DtIJVu_q>2(C5$wxJ4`3Dosn&
zHdrcFFg0jo*`g`Yx8bfw<awCnvu80CSxhX0lD-v=>PIxAC;EMYVj_9ZfI>|B;*;O>
zORDXQo@ew5h)kJ(yf9|%@-s)-=X|2%mL=g#xNx0E=HhD}eU<*=`J(R@iAU7>!Z*Lx
z_e!{B?z`f}r`?~dO_*cu1m?*6Lk!E!c)3lv9Nx<O!x5zk=US95xT4tLlhOtyR}Zwi
zI^cn;6@Iunv8T@6j(*AA4f8x%EatW*>H&BcpRIZ767>-7<*7VdQR10egzQY^KkG*w
zMBhE{gs1c4Q1bS{8SgN>@H(-p#5aY0)rX(LV!ko-?SAf#e*!%TOv34a13m`quqr6S
W?cgl-8AA&Cg-}1d4?V!h!ty^G7!X7N

delta 714
zcmXZZTPQ<u90&0I&pBgT33ZgBO>%FAnY&`HWs*w@kxVW*XWOwWrFdQ|bRM+5xFioA
zcrc};@aFnNp1j(Naw+A(1N;8=^!a_izyD6_|BrsL=od@tv-5&MqtR(Jugi}cX$5=&
z>k)W0B~W#&5LPfVoM5#u!YbiCtAae&2yI+7T;eS7kgI`l&I*lu1Ki>()i9rtoNcgF
zs8E%FUd<H@$=n9r0_`I#UwsnN(Zz)_C~8~bh;}&PaZJ0<FpQ_}=`aWxpVa(hUhrtn
zvU)fShU{M&^f|k9<}mk+8rf8qf-{lAby}H=uW0pI`h)*>{ALwt#n(L3mtX38MEuI!
zdr8BG!<U+9)Y<tMG)i<4LsB#Hrc@5ECAv5!HzBvkT`(lu;Dbz;Av*2I4rd2EaJIsC
zXD6(4wZj!xH_UVAsBsrPLY})H-OYcu=B`W5gLF=zT}b}lDMjc`6?&|1WdON*VGf=w
zj6u=U3#UCp@Z3ZD67M8(*o#L|<K9u^b|1Op8%JjT2{`4Sh4+33v;-u$9hiaopbQs-
MeegDT2cwItf1A}#A^-pY

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)