From 937f98d35b7bf6f809c229a9546272ef0fb1a1b4 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:44:58 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制
---
zq-erp/src/main/java/com/matrix/core/pojo/AjaxResult.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/core/pojo/AjaxResult.java b/zq-erp/src/main/java/com/matrix/core/pojo/AjaxResult.java
index 456a3f1..8582d87 100644
--- a/zq-erp/src/main/java/com/matrix/core/pojo/AjaxResult.java
+++ b/zq-erp/src/main/java/com/matrix/core/pojo/AjaxResult.java
@@ -4,6 +4,7 @@
import com.matrix.core.tools.InternationaUtil;
import com.matrix.core.tools.MdcUtil;
import com.matrix.core.tools.StringUtils;
+import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
import java.io.Serializable;
import java.util.HashMap;
@@ -84,6 +85,11 @@
public static AjaxResult buildSuccessInstance(List<?> rows, Integer total) {
return new AjaxResult(STATUS_SUCCESS, rows, total);
}
+
+ public static AjaxResult buildSuccessInstance(List<?> rows, long total) {
+ return new AjaxResult(STATUS_SUCCESS, rows, Integer.parseInt(total+""));
+ }
+
public static AjaxResult buildSuccessInstance(List<?> rows) {
return new AjaxResult(STATUS_SUCCESS, rows);
@@ -125,6 +131,7 @@
+
public Integer getTotal() {
return total;
}
--
Gitblit v1.9.1