From ad3119f7b7e0375a8363b900346284bb1c274a3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 12:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java |   92 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java b/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java
index 3f48c2e..c1648f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java
@@ -28,6 +28,22 @@
 	@Map("fanli_order_statisticed_msg")
 	private String fanliOrderStatisticedMsg;
 
+	// 鍒嗕韩璁㈠崟琚粺璁�
+	@Map("share_order_statisticed_title")
+	private String shareOrderStatisticedTitle;
+	@Map("share_order_statisticed_push")
+	private String shareOrderStatisticedPush;
+	@Map("share_order_statisticed_msg")
+	private String shareOrderStatisticedMsg;
+
+	// 閭�璇疯鍗曡缁熻
+	@Map("invite_order_statisticed_title")
+	private String inviteOrderStatisticedTitle;
+	@Map("invite_order_statisticed_push")
+	private String inviteOrderStatisticedPush;
+	@Map("invite_order_statisticed_msg")
+	private String inviteOrderStatisticedMsg;
+
 	// 鎻愭垚璁㈠崟琚粺璁�
 	@Map("ticheng_order_statisticed_title")
 	private String tichengOrderStatisticedTitle;
@@ -44,15 +60,14 @@
 	private String inviteMoneyRecievePush;
 	@Map("invite_money_recieve_msg")
 	private String inviteMoneyRecieveMsg;
-	
-	//鍒嗕韩璧氬晢涓氭敹鍏ュ埌璐︽彁绀�
+
+	// 鍒嗕韩璧氬晢涓氭敹鍏ュ埌璐︽彁绀�
 	@Map("share_money_recieve_title")
 	private String shareMoneyRecieveTitle;
 	@Map("share_money_recieve_push")
 	private String shareMoneyRecievePush;
 	@Map("share_money_recieve_msg")
 	private String shareMoneyRecieveMsg;
-	
 
 	// 鍞悗缁存潈璁㈠崟鎵ｆ鎻愮ず
 
@@ -64,9 +79,8 @@
 
 	@Map("weiquan_drawback_fanli_push")
 	private String weiquanDrawbackFanliPush;
-	
-	
-	//閭�璇疯禋缁存潈
+
+	// 閭�璇疯禋缁存潈
 	@Map("weiquan_drawback_invite_title")
 	private String weiquanDrawbackInviteTitle;
 
@@ -75,9 +89,8 @@
 
 	@Map("weiquan_drawback_invite_push")
 	private String weiquanDrawbackInvitePush;
-	
-	
-    //鍒嗕韩璧氱淮鏉�
+
+	// 鍒嗕韩璧氱淮鏉�
 	@Map("weiquan_drawback_share_title")
 	private String weiquanDrawbackShareTitle;
 
@@ -124,15 +137,13 @@
 
 	@Map("extract_success_msg")
 	private String extractSuccessMsg;
-	
-	//鏀粯瀹濊处鎴烽獙璇�
+
+	// 鏀粯瀹濊处鎴烽獙璇�
 	@Map("alipay_account_valid_title")
 	private String alipayAccountValidTitle;
-	
+
 	@Map("alipay_account_valid_msg")
 	private String alipayAccountValidMsg;
-	
-	
 
 	public String getInviteMoneyRecieveTitle() {
 		return inviteMoneyRecieveTitle;
@@ -294,8 +305,6 @@
 		this.orderFanliRecieveTitle = orderFanliRecieveTitle;
 	}
 
-
-
 	public String getWeiquanDrawbackFanliTitle() {
 		return weiquanDrawbackFanliTitle;
 	}
@@ -368,7 +377,6 @@
 		this.orderFanliRecieveMsg = orderFanliRecieveMsg;
 	}
 
-
 	public String getWeiquanDrawbackFanliMsg() {
 		return weiquanDrawbackFanliMsg;
 	}
@@ -392,8 +400,6 @@
 	public void setExtractApplayPush(String extractApplayPush) {
 		this.extractApplayPush = extractApplayPush;
 	}
-
-
 
 	public String getExtractTransferFailPush() {
 		return extractTransferFailPush;
@@ -467,4 +473,52 @@
 		this.weiquanDrawbackSharePush = weiquanDrawbackSharePush;
 	}
 
+	public String getShareOrderStatisticedTitle() {
+		return shareOrderStatisticedTitle;
+	}
+
+	public void setShareOrderStatisticedTitle(String shareOrderStatisticedTitle) {
+		this.shareOrderStatisticedTitle = shareOrderStatisticedTitle;
+	}
+
+	public String getShareOrderStatisticedPush() {
+		return shareOrderStatisticedPush;
+	}
+
+	public void setShareOrderStatisticedPush(String shareOrderStatisticedPush) {
+		this.shareOrderStatisticedPush = shareOrderStatisticedPush;
+	}
+
+	public String getShareOrderStatisticedMsg() {
+		return shareOrderStatisticedMsg;
+	}
+
+	public void setShareOrderStatisticedMsg(String shareOrderStatisticedMsg) {
+		this.shareOrderStatisticedMsg = shareOrderStatisticedMsg;
+	}
+
+	public String getInviteOrderStatisticedTitle() {
+		return inviteOrderStatisticedTitle;
+	}
+
+	public void setInviteOrderStatisticedTitle(String inviteOrderStatisticedTitle) {
+		this.inviteOrderStatisticedTitle = inviteOrderStatisticedTitle;
+	}
+
+	public String getInviteOrderStatisticedPush() {
+		return inviteOrderStatisticedPush;
+	}
+
+	public void setInviteOrderStatisticedPush(String inviteOrderStatisticedPush) {
+		this.inviteOrderStatisticedPush = inviteOrderStatisticedPush;
+	}
+
+	public String getInviteOrderStatisticedMsg() {
+		return inviteOrderStatisticedMsg;
+	}
+
+	public void setInviteOrderStatisticedMsg(String inviteOrderStatisticedMsg) {
+		this.inviteOrderStatisticedMsg = inviteOrderStatisticedMsg;
+	}
+
 }

--
Gitblit v1.8.0