From 2911b03b2b1f230a7cd9ded09adb4274789fbb0c Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 11 Apr 2018 10:39:56 +0800
Subject: [PATCH] merge

---
 .../main/java/com/xwbing/service/sys/CommonConfigService.java | 2 +-
 .../main/java/com/xwbing/controller/sys/SysConfigControl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/service/sys/CommonConfigService.java b/boot-service/src/main/java/com/xwbing/service/sys/CommonConfigService.java
index 04462a5..80b4e31 100644
--- a/boot-service/src/main/java/com/xwbing/service/sys/CommonConfigService.java
+++ b/boot-service/src/main/java/com/xwbing/service/sys/CommonConfigService.java
@@ -15,7 +15,7 @@ import javax.annotation.Resource;
  * 项目名称: boot-module-demo
  * 创建时间: 2018/4/10 17:58
  * 作者: xiangwb
- * 说明: 公共配置信息
+ * 说明: 公共信息配置
  */
 @Service
 public class CommonConfigService {
diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java
index 41a6997..a329271 100644
--- a/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java
@@ -34,8 +34,8 @@ public class SysConfigControl {
         return JsonResult.toJSONObj(email, "");
     }
 
-    @LogInfo("添加修改邮箱配置信息")
-    @ApiOperation(value = "添加修改邮箱配置信息", response = RestMessageVo.class)
+    @LogInfo("添加/修改邮箱配置信息")
+    @ApiOperation(value = "添加/修改邮箱配置信息", response = RestMessageVo.class)
     @PostMapping("saveOrUpdateEmail")
     public JSONObject saveOrUpdateEmail(@RequestBody EmailModel emailModel) {
         RestMessage restMessage = commonConfigService.saveOrUpdateEmail(emailModel);