Merge remote-tracking branch 'origin/dev' into dev

designer_form/build.gradle

@@ -32,14 +32,15 @@ buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 
 
-FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar"
+FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar'
+
 jars.each{File file->
 println "-----------this jar path is ${file.path}----------"
 }
 //ÉùÃ÷ÍⲿÒÀÀµ
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar'
 
  	testCompile 'junit:junit:4.12'
 }