Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java

@@ -95,7 +95,7 @@ public class WxEnergyMeter extends TenantEntity {
 	private Integer electriType;
 	@TableField(exist = false)
 	private String electriTypeName;
-	public String getElectriType() {
+	public String getElectriTypeName() {
 		if (null != electriType) {
 			return EnumeElectriType.getEnum(electriType).getMessage();
 		}