diff --git a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
index c6a4fd538..e6c52e3f8 100644
--- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
+++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
@@ -148,8 +148,6 @@ public class Test {
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setTenantId("456");
wxBillAll.setMerchantId(324754110547066880l);
- wxBillAll.setPageIndex(1);
- wxBillAll.setPageSize(6);
System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll)));
}
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
index 632b71865..14ce62e61 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
@@ -3,6 +3,7 @@ package com.iformall.domain.vo;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
+import javax.persistence.Transient;
import java.math.BigDecimal;
import java.util.Date;
@@ -74,6 +75,9 @@ public class WxBillAllVo {
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime")
private Date updatetime;
+ @Transient
+ private Integer freeze;
+
public String getReceivePayStr() {
if(getReceivePay()!=null) {
receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString();
diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
index e537dec06..e2a14bf93 100644
--- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
@@ -38,8 +38,8 @@
-
-
+
+