From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountCoupon.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountCoupon.java
index 135a370..03d48ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountCoupon.java
@@ -24,7 +24,10 @@
 		welfareFreeCouponMoney("绂忓埄鍏嶅崟缁熻閲戦"), 
 		freeCouponGiveNum("璧犻�佸厤鍗曞埜缁熻鏁伴噺"),
 		rebateCouponNum("杩斿埄濂栧姳鍒哥粺璁℃暟閲�"),
-		rebateCouponMoney("杩斿埄濂栧姳鍒哥粺璁￠噾棰�");
+		rebateCouponMoney("杩斿埄濂栧姳鍒哥粺璁￠噾棰�"),
+		pullNewCouponNum("鎷夋柊鍏嶅崟鍒哥粺璁℃暟閲�"),
+		pullNewCouponMoney("鎷夋柊鍏嶅崟鍒哥粺璁￠噾棰�");
+		
 
 		private final String desc;
 		

--
Gitblit v1.8.0