Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

# Conflicts:
#	applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -1,23 +1,26 @@
 package com.usoftchina.saas.commons.api;
-
 import com.usoftchina.saas.base.Result;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-
+/**
+ * @Description: 编号接口
+ * @Author: guq
+ * @Date: 2018/10/20
+ */
 @FeignClient("commons-server")
 public interface MaxnumberService {
     /**
-    * @Description: 更新并获取最大编号
-    * @Param: [count, code, caller]
-    * @return: com.usoftchina.saas.base.Result
-    * @Author: guq
-    * @Date: 2018/10/19 api/commons
-    */
+     * @Description: 更新并获取最大编号
+     * @Param: [count, code, caller]
+     * @return: com.usoftchina.saas.base.Result
+     * @Author: guq
+     * @Date: 2018/10/19 api/commons
+     */
     @PostMapping("/number/pushMaxnubmer")
     public String pushMaxnubmer(@RequestParam("count") Integer count,@RequestParam("code") String code,
                                 @RequestParam("caller") String caller);
-
     /**
      * @Description 获取单号
      * @Param: [caller, update]
@@ -27,5 +30,4 @@ public interface MaxnumberService {
      */
     @PostMapping("/getMaxnumber")
     public Result getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
-
 }

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java

@@ -2,7 +2,6 @@ package com.usoftchina.saas.commons.api;
 
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;