Merge remote-tracking branch 'origin/master'

cx-equipment/.gitignore

@@ -6,8 +6,8 @@
 .idea/misc.xml
 .idea/modules.xml
 .idea/vcs.xml
-business-common/business-common.iml
-business-entity/business-entity.iml
-business-server/business-server.iml
-business-server/src/test/
+cx-equipment-common/business-common.iml
+cx-equipment-entity/business-entity.iml
+cx-equipment-server/business-server.iml
+cx-equipment-server/src/test/
 rw-business.iml

cx-equipment/business-common/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>rw-business</artifactId>
+        <artifactId>cx-equipment</artifactId>
         <groupId>com.rongwei</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>business-common</artifactId>
+    <artifactId>cx-equipment-common</artifactId>
 
     <properties>
         <mysql.version>8.0.11</mysql.version>

cx-equipment/business-entity/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>rw-business</artifactId>
+        <artifactId>cx-equipment</artifactId>
         <groupId>com.rongwei</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>business-entity</artifactId>
+    <artifactId>cx-equipment-entity</artifactId>
 
     <dependencies>
         <dependency>

cx-equipment/pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.rongwei</groupId>
-    <artifactId>rw-business</artifactId>
+    <artifactId>cx-equipment</artifactId>
     <version>1.0-SNAPSHOT</version>
     <modules>
-        <module>business-server</module>
-        <module>business-common</module>
-        <module>business-entity</module>
+        <module>cx-equipment-server</module>
+        <module>cx-equipment-common</module>
+        <module>cx-equipment-entity</module>
     </modules>
 
     <!--<parent>
@@ -20,9 +20,9 @@
     </parent>-->
 
     <parent>
-        <artifactId>InControl</artifactId>
+        <artifactId>safe-produce</artifactId>
         <groupId>com.rongwei</groupId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -13,6 +13,7 @@
         <module>cx-safe-check</module>
         <module>cx-file</module>
         <module>bs-common</module>
+        <module>cx-equipment</module>
     </modules>
 
     <parent>