Merge remote-tracking branch 'origin/master'

# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less

auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml

@@ -85,6 +85,16 @@
         WHERE platform_id=#{platformId}
     </select>
 
+    <resultMap id="VPBasicPlatformMap" type="com.solution.rule.domain.BasicPlatform">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="description" column="description"/>
+    </resultMap>
+    <select id="findAllBasicPlatformComponents" resultMap="VPBasicPlatformMap">
+        SELECT *
+        FROM platform
+    </select>
+
     <resultMap id="VPlatformMap" type="com.solution.rule.domain.Platform">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
@@ -106,4 +116,9 @@
         ORDER BY p.name,pc.name
     </select>
 
+    <select id="findAllPlatformComponents" resultMap="VPlatformMap">
+        SELECT *
+        FROM platform
+    </select>
+
 </mapper>