From d874ce9747129db73ce644992456647173d88e06 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 23 Jul 2023 16:22:35 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-base-service/pom.xml | 2 +- order-management-consumer/pom.xml | 2 +- .../main/resources/download/OrderExcel.xlsx | Bin 12588 -> 12680 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/pom.xml b/order-management-base-service/pom.xml index 47e3816d..ee0b1755 100644 --- a/order-management-base-service/pom.xml +++ b/order-management-base-service/pom.xml @@ -344,7 +344,7 @@ com.dxhy.base sims-base-file-operate - 6.1.4.2-BASE + 6.1.4.3-BASE compile diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml index dcd8e927..1cb8a44b 100644 --- a/order-management-consumer/pom.xml +++ b/order-management-consumer/pom.xml @@ -325,7 +325,7 @@ com.dxhy.base sims-base-file-operate - 6.1.4.2-BASE + 6.1.4.3-BASE compile diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 9875652acff36ad2ab7521f7db52da3a59d1a3f6..94aa0f2955a0d5ea6c972481e28bd144787e2c1f 100644 GIT binary patch delta 5639 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 delta 5558 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