Merge branch 'V0.0.6-iot' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.6-iot

# Conflicts:
#	project_data/sql/0.0.6-iot/soc/soc.sql

soc-modules/soc-modules-iot/pom.xml

@@ -40,11 +40,6 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-            <version>3.0.1.RELEASE</version>
-        </dependency>
 
         <!-- Swagger UI -->
         <!--      <dependency>