Merge branch 'master' of http://git.minpay.cc/SupplyChain/system

tianhu-system/pom.xml

@@ -170,11 +170,9 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
         </dependency>
-        <!-- FastDFS 分布式文件系统 -->
         <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
-            <version>1.26.5</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
     </dependencies>
 

tianhu-system/src/main/java/com/tianhu/system/TianHuSystemApplication.java

@@ -16,7 +16,7 @@ import com.tianhu.common.swagger.annotation.EnableCustomSwagger2;
 @EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringCloudApplication
-@MapperScan("com.tianhu.system.mapper")
+@MapperScan({"com.tianhu.system.mapper","com.tianhu.system.*.mapper"})
 public class TianHuSystemApplication
 {
     public static void main(String[] args)