diff --git a/.gitignore b/.gitignore
index 62f36fb..e1f2e57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,6 @@ hs_err_pid*
 replay_pid*
 
 data
-.idea
\ No newline at end of file
+.idea
+
+.flattened-pom.xml
\ No newline at end of file
diff --git a/blade-auth/.gitignore b/blade-auth/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-auth/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-common/.gitignore b/blade-common/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-common/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-gateway/.gitignore b/blade-gateway/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-gateway/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops-api/blade-develop-api/.gitignore b/blade-ops-api/blade-develop-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops-api/blade-develop-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops-api/blade-flow-api/.gitignore b/blade-ops-api/blade-flow-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops-api/blade-flow-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops-api/blade-resource-api/.gitignore b/blade-ops-api/blade-resource-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops-api/blade-resource-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops/blade-admin/.gitignore b/blade-ops/blade-admin/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops/blade-admin/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops/blade-develop/.gitignore b/blade-ops/blade-develop/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops/blade-develop/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops/blade-job/.gitignore b/blade-ops/blade-job/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops/blade-job/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops/blade-log/.gitignore b/blade-ops/blade-log/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops/blade-log/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops/blade-report/.gitignore b/blade-ops/blade-report/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops/blade-report/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-ops/blade-resource/.gitignore b/blade-ops/blade-resource/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-ops/blade-resource/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service-api/blade-desk-api/.gitignore b/blade-service-api/blade-desk-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service-api/blade-desk-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service-api/blade-dict-api/.gitignore b/blade-service-api/blade-dict-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service-api/blade-dict-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service-api/blade-record-api/.gitignore b/blade-service-api/blade-record-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service-api/blade-record-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service-api/blade-scope-api/.gitignore b/blade-service-api/blade-scope-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service-api/blade-scope-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service-api/blade-system-api/.gitignore b/blade-service-api/blade-system-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service-api/blade-system-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service-api/blade-user-api/.gitignore b/blade-service-api/blade-user-api/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service-api/blade-user-api/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service/blade-desk/.gitignore b/blade-service/blade-desk/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service/blade-desk/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 2e93bc0..4e15aec 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
+<<<<<<< HEAD
         </dependency><dependency><groupId>org.flowable</groupId><artifactId>flowable-engine</artifactId><version>7.1.0</version><scope>compile</scope></dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
@@ -56,6 +57,23 @@
 <!--        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
+=======
+        </dependency>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-engine</artifactId>
+            <version>7.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>-->
+
+        <!-- blade excel starter -->
+        <dependency>
+            <groupId>org.springblade</groupId>
+>>>>>>> 643ab909e8aa4a1f71c31a70bd875a78f65bfd65
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
     </dependencies>
diff --git a/blade-service/blade-monitor/.gitignore b/blade-service/blade-monitor/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service/blade-monitor/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service/blade-scheduling/.gitignore b/blade-service/blade-scheduling/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service/blade-scheduling/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
diff --git a/blade-service/blade-system/.gitignore b/blade-service/blade-system/.gitignore
new file mode 100644
index 0000000..f364341
--- /dev/null
+++ b/blade-service/blade-system/.gitignore
@@ -0,0 +1,9 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file