From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
index 7d3731a..b3e3a64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
@@ -31,6 +31,8 @@
 	public final static int URL = 2; // 缃戦〉鎺ㄩ��
 	public final static int DETAIL = 3; // 璇︽儏鎺ㄩ��
 	public final static int ZNX = 4; // 绔欏唴鎺ㄩ��
+	public final static int WEEX = 5; // 绔欏唴鎺ㄩ��
+	public final static int BAICHUAN = 6; // 绔欏唴鎺ㄩ��
 
 	@Resource
 	private PushRecordService pushRecordService;

--
Gitblit v1.8.0