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

# Conflicts:
#	pom.xml

pom.xml

@@ -368,6 +368,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-customerManagement</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
 
             <!--  工作流模块  -->
             <dependency>

ruoyi-admin/pom.xml

@@ -80,6 +80,11 @@
             <artifactId>ruoyi-commodityManagement</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-customerManagement</artifactId>
+        </dependency>
+
         <!-- 代码生成-->
         <dependency>
             <groupId>org.dromara</groupId>

ruoyi-modules/pom.xml

@@ -18,6 +18,7 @@
         <module>ruoyi-bulkOrder</module>
         <module>ruoyi-developmentManagement</module>
         <module>ruoyi-commodityManagement</module>
+        <module>ruoyi-customerManagement</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>