From f9826d35b982db7039519f5727610978e5fa9c28 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 29 Apr 2020 09:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # pom.xml --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 363cdad..dfb2c98 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.afterturn easypoi-spring-boot-starter - 4.2.0 + 4.2.0.A jar easypoi-spring-boot-starter @@ -46,7 +46,11 @@ cn.afterturn easypoi-web +<<<<<<< HEAD 4.2.0 +======= + 4.1.3.A +>>>>>>> f51df45... 支持前缀