Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

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

@@ -89,7 +89,10 @@ public class WxAllBill extends TenantEntity {
 	@TableField(exist = false)
 	public String billTypeName;
 	public String getBillTypeName() {
-		return EnumBillAllType.RENT.getMessage();
+		if (null != billType) {
+			billTypeName = EnumBillAllType.getEnum(billType).getMessage();
+		}
+		return billTypeName;
 	}
     
 	@io.swagger.annotations.ApiModelProperty(value = "支付方式", name = "payWay")