From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java
index 75e1e1b..82135b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java
@@ -10,7 +10,9 @@
*/
public class ExtractOrderStatisticDTO {
- private int orderCount50More;// 杩斿埄瓒呰繃瓒呰繃50鍏冪殑璁㈠崟鏁伴噺
+ private int orderCount50More;// 杩斿埄瓒呰繃50鍏冪殑璁㈠崟鏁伴噺
+
+ private Integer orderCount100More;// 杩斿埄瓒呰繃100鍏冪殑璁㈠崟鏁伴噺
private int weiQuanOrderCount;// 缁存潈璁㈠崟鏁伴噺
@@ -62,4 +64,12 @@
this.safeOrderCount = safeOrderCount;
}
+ public Integer getOrderCount100More() {
+ return orderCount100More;
+ }
+
+ public void setOrderCount100More(Integer orderCount100More) {
+ this.orderCount100More = orderCount100More;
+ }
+
}
--
Gitblit v1.8.0