Browse Source

冲突解决

huangzhiyong 6 years ago
parent
commit
b0d3072885
1 changed files with 1 additions and 0 deletions
  1. 1 0
      pom.xml

+ 1 - 0
pom.xml

@ -137,6 +137,7 @@
        </dependency>
        </dependency>
    </dependencies>
    </dependencies>
    
    <build>
    <build>
        <plugins>
        <plugins>
            <plugin>
            <plugin>