czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
zhujunshuai
2023-02-02 16:50:59 +08:00
parent a0d5f0fb3c b9b0330659
commit 453052a936
21 changed files with 244 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pluss-api-page/pluss-api-page.iml
View File

@@ -126,8 +126,6 @@
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
@@ -216,6 +214,15 @@
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
<orderEntry type="library" name="Maven: com.github.tencentyun:tls-sig-api:1.2" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />