From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/pom.xml | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/pom.xml index 2efc9f8..db722e9 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/pom.xml +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/pom.xml @@ -16,12 +16,6 @@ <description>web钀ラ攢淇℃伅绯荤粺</description> <dependencies> - <!--OkHttp--> -<!-- <dependency>--> -<!-- <groupId>com.squareup.okhttp3</groupId>--> -<!-- <artifactId>okhttp</artifactId>--> -<!-- <version>4.9.2</version>--> -<!-- </dependency>--> <!-- 闃块噷浜戠煭淇′緷璧� --> <dependency> <groupId>com.aliyun</groupId> @@ -35,9 +29,9 @@ </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - <optional>true</optional> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> </dependency> <!--OkHttp--> -- Gitblit v1.8.0