Merge branch 'dev_power_axis' of http://121.42.41.42:7070/r/epmet-plugins into dev_power_axis

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisLeaderDetailResultDTO.java

@@ -7,7 +7,7 @@ public class PowerAxisLeaderDetailResultDTO {
     private String name;
     private String gender;
     private String mobile;
-    private String introduction;
+    private String interoduction;
     private String categoryName;
     private String avatar;
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -143,10 +143,10 @@
 	        customer_id = #{customerId}
     </select>
     <select id="getKernelHouseHold" resultType="java.lang.Integer">
-        select count(*) from pli_power_kernel_household and customer_id = #{customerId}
+        select count(*) from pli_power_kernel_household where customer_id = #{customerId}
     </select>
     <select id="getServiceStation" resultType="java.lang.Integer">
-        select count(*) from pli_power_service_station and customer_id = #{customerId}
+        select count(*) from pli_power_service_station where customer_id = #{customerId}
     </select>
     <select id="getStructTree"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO">