解决代码合并问题

pom.xml

@@ -59,7 +59,7 @@
         <mybatis-spring-boot.version>2.1.1</mybatis-spring-boot.version>
         <druid.version>1.1.21</druid.version>
         <swagger.version>2.9.2</swagger.version>
-        <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
+        <knife4j.version>2.0.2</knife4j.version>
         <logstash.version>5.2</logstash.version>
         <poi.version>4.1.1</poi.version>
         <aggregator.version>1.1.0</aggregator.version>
@@ -129,11 +129,12 @@
                 <artifactId>springfox-swagger-ui</artifactId>
                 <version>${swagger.version}</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>com.github.xiaoymin</groupId>-->
-                <!--<artifactId>swagger-bootstrap-ui</artifactId>-->
-                <!--<version>${swagger-bootstrap.version}</version>-->
-            <!--</dependency>-->
+            <!--knife4j-->
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-spring-ui</artifactId>
+                <version>${knife4j.version}</version>
+            </dependency>
 
             <!--<dependency>-->
                 <!--<groupId>de.codecentric</groupId>-->
@@ -195,6 +196,30 @@
         </dependencies>
     </dependencyManagement>
 
+    <!-- 私有仓库 -->
+    <repositories>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+        </repository>
+    </repositories>
+    <!-- 私有仓库 -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+
     <distributionManagement>
         <repository>
             <id>nexus-releases</id>