diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml
index eb279c9..5acac2e 100644
--- a/payment-base-app/pom.xml
+++ b/payment-base-app/pom.xml
@@ -61,5 +61,58 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Swagger API文档 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>swagger-models</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-bean-validators</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- # 增加两个配置解决 NumberFormatException -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.22</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java
index 82bc4e0..84e51f5 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java
@@ -4,20 +4,26 @@ import com.base.springcloud.base.CommonResult;
 import com.base.springcloud.constant.ErrorConstant;
 import com.base.springcloud.entity.Merchant;
 import com.base.springcloud.service.MerchantService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @Slf4j
+@Api(tags="商户管理")
+@RequestMapping("/merchant")
 public class MerchantController {
 
 	@Autowired
 	private MerchantService merchantService;
 
-	@PostMapping("/merchant/add")
+	@ApiOperation(value="创建商户信息")
+	@PostMapping("/add")
 	public CommonResult create(@RequestBody Merchant merchant) {
 		// TODO 业务逻辑
 
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java b/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java
index e000bdb..038775d 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java
@@ -1,6 +1,6 @@
 package com.base.springcloud.service;
 
-import com.rbs.springcloud.pojo.merchant.Merchant;
+import com.base.springcloud.entity.Merchant;
 
 public interface MerchantService {
 
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java
index 1e588b9..cd8ba01 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java
@@ -1,7 +1,7 @@
 package com.base.springcloud.service.imp;
 
+import com.base.springcloud.entity.Merchant;
 import com.base.springcloud.service.MerchantService;
-import com.rbs.springcloud.pojo.merchant.Merchant;
 import org.springframework.stereotype.Service;
 
 @Service