| @@ -3,7 +3,7 @@ | |||||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi-spring-boot-starter</artifactId> | <artifactId>easypoi-spring-boot-starter</artifactId> | ||||
| <version>4.2.0</version> | |||||
| <version>4.2.0.A</version> | |||||
| <packaging>jar</packaging> | <packaging>jar</packaging> | ||||
| <name>easypoi-spring-boot-starter</name> | <name>easypoi-spring-boot-starter</name> | ||||
| @@ -46,7 +46,11 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi-web</artifactId> | <artifactId>easypoi-web</artifactId> | ||||
| <<<<<<< HEAD | |||||
| <version>4.2.0</version> | <version>4.2.0</version> | ||||
| ======= | |||||
| <version>4.1.3.A</version> | |||||
| >>>>>>> f51df45... 支持前缀 | |||||
| </dependency> | </dependency> | ||||
| <!-- Compile dependencies --> | <!-- Compile dependencies --> | ||||
| <dependency> | <dependency> | ||||