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

33
.idea/artifacts/pluss_manage_page_war_exploded.xml generated
View File

@@ -82,7 +82,6 @@
<element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.06" />
<element id="library" level="project" name="Maven: cn.jpush.api:jpush-client:3.5.5" />
<element id="library" level="project" name="Maven: io.netty:netty-all:4.1.29.Final" />
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" />
<element id="library" level="project" name="Maven: cn.jpush.api:jiguang-common:1.1.12" />
<element id="library" level="project" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" />
<element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" />
@@ -96,17 +95,6 @@
<element id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:4.0.1" />
<element id="library" level="project" name="Maven: com.jhlabs:filters:2.0.235-1" />
<element id="library" level="project" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" />
<element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.14" />
<element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.7" />
<element id="library" level="project" name="Maven: com.aliyun:tea:1.2.0" />
<element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.2.6" />
<element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.4" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
<element id="library" level="project" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" />
<element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.5" />
<element id="library" level="project" name="Maven: org.dom4j:dom4j:2.0.3" />
<element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.14" />
<element id="library" level="project" name="Maven: cn.hutool:hutool-all:5.8.4" />
<element id="library" level="project" name="Maven: xml-security:xmlsec:1.3.0" />
<element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.2" />
@@ -114,8 +102,6 @@
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" />
<element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.8.1" />
<element id="library" level="project" name="Maven: org.projectlombok:lombok:1.18.20" />
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" />
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
<element id="library" level="project" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" />
<element id="library" level="project" name="Maven: com.alibaba:druid:1.1.23" />
<element id="library" level="project" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" />
@@ -191,6 +177,25 @@
<element id="library" level="project" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" />
<element id="library" level="project" name="Maven: com.aliyun:cloudauth20200618:2.0.3" />
<element id="library" level="project" name="Maven: com.aliyun:oss-client:3.0.2" />
<element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.5" />
<element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.1" />
<element id="library" level="project" name="Maven: com.aliyun:openplatform20191219:3.0.2" />
<element id="library" level="project" name="Maven: com.aliyun:tea-rpc-util:0.1.2" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
<element id="library" level="project" name="Maven: com.aliyun:tea-rpc:0.1.2" />
<element id="library" level="project" name="Maven: com.aliyun:oss-util:1.0.0" />
<element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.11" />
<element id="library" level="project" name="Maven: com.aliyun:tea-fileform:0.0.3" />
<element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.6" />
<element id="library" level="project" name="Maven: com.aliyun:tea:1.2.3" />
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" />
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
<element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.0.16" />
<element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.6" />
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" />
<element id="library" level="project" name="Maven: javax.annotation:javax.annotation-api:1.3.2" />
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
<element id="library" level="project" name="Maven: org.apache.taglibs:taglibs-standard-impl:1.2.5" />