From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java | 489 +++++++++++++++---------------------------------------
1 files changed, 137 insertions(+), 352 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..a501e32 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
@@ -3,223 +3,109 @@
import org.yeshi.utils.annotation.Map;
public class ZNXConfig {
- // 绔欏唴淇″拰鎺ㄩ�佹秷鎭�
- // 鏂颁汉绾㈠寘
- @Map("newer_hongbao_title")
- private String newerHongbaoTitle;
- @Map("newer_hongbao_push")
- private String newerHongbaoPush;
- @Map("newer_hongbao_msg")
- private String newerHongbaoMsg;
- // 璁㈠崟杩斿埄鍒拌处
- @Map("order_fanli_recieve_title")
- private String orderFanliRecieveTitle;
- @Map("order_fanli_recieve_push")
- private String orderFanliRecievePush;
- @Map("order_fanli_recieve_msg")
- private String orderFanliRecieveMsg;
-
- // 杩斿埄璁㈠崟琚粺璁�
+ // 杩斿埄璁㈠崟琚粺璁★紙澶辨晥璁㈠崟鏃犳帹閫侊級
@Map("fanli_order_statisticed_title")
private String fanliOrderStatisticedTitle;
- @Map("fanli_order_statisticed_push")
- private String fanliOrderStatisticedPush;
@Map("fanli_order_statisticed_msg")
private String fanliOrderStatisticedMsg;
+ // 鍒嗕韩璁㈠崟琚粺璁★紙娉ㄦ剰璁㈠崟鍙烽殣钘忥級
+ @Map("share_order_statisticed_title")
+ private String shareOrderStatisticedTitle;
+ @Map("share_order_statisticed_msg")
+ private String shareOrderStatisticedMsg;
+ // 閭�璇疯鍗曡缁熻锛堟敞鎰忚鍗曞彿闅愯棌锛�
+ @Map("invite_order_statisticed_title")
+ private String inviteOrderStatisticedTitle;
+ @Map("invite_order_statisticed_msg")
+ private String inviteOrderStatisticedMsg;
- // 鎻愭垚璁㈠崟琚粺璁�
- @Map("ticheng_order_statisticed_title")
- private String tichengOrderStatisticedTitle;
- @Map("ticheng_order_statisticed_push")
- private String tichengOrderStatisticedPush;
- @Map("ticheng_order_statisticed_msg")
- private String tichengOrderStatisticedMsg;
+ // 杩斿埄鍒拌处
+ @Map("money_fanli_recieved_title")
+ private String moneyFanliRecievedTitle;
+ @Map("money_fanli_recieved_msg")
+ private String moneyFanliRecievedMsg;
+ // 鍒嗕韩濂栭噾鍒拌处
+ @Map("money_share_recieved_title")
+ private String moneyShareRecievedTitle;
+ @Map("money_share_recieved_msg")
+ private String moneyShareRecievedMsg;
+ // 閭�璇峰閲戝埌璐�
+ @Map("money_invite_recieved_title")
+ private String moneyInviteRecievedTitle;
+ @Map("money_invite_recieved_msg")
+ private String moneyInviteRecievedMsg;
- // 閭�璇疯禋涓婃湀鏀跺叆鍒拌处鎻愮ず
+ // 鍥㈤槦鍒嗙孩
+ @Map("money_team_dividents_recieved_title")
+ private String moneyTeamDividentsRecievedTitle;
- @Map("invite_money_recieve_title")
- private String inviteMoneyRecieveTitle;
- @Map("invite_money_recieve_push")
- 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;
-
+ @Map("money_team_dividents_recieved_msg")
+ private String moneyTeamDividentsRecievedMsg;
- // 鍞悗缁存潈璁㈠崟鎵ｆ鎻愮ず
+ // 瀵煎笀娲ヨ创
+ @Map("money_tearcher_subsidy_recieved_title")
+ private String moneyTearcherSubsidyRecievedTitle;
- @Map("weiquan_drawback_fanli_title")
- private String weiquanDrawbackFanliTitle;
+ @Map("money_tearcher_subsidy_recieved_msg")
+ private String moneyTearcherSubsidyRecievedMsg;
- @Map("weiquan_drawback_fanli_msg")
- private String weiquanDrawbackFanliMsg;
-
- @Map("weiquan_drawback_fanli_push")
- private String weiquanDrawbackFanliPush;
-
-
- //閭�璇疯禋缁存潈
- @Map("weiquan_drawback_invite_title")
- private String weiquanDrawbackInviteTitle;
-
- @Map("weiquan_drawback_invite_msg")
- private String weiquanDrawbackInviteMsg;
-
- @Map("weiquan_drawback_invite_push")
- private String weiquanDrawbackInvitePush;
-
-
- //鍒嗕韩璧氱淮鏉�
- @Map("weiquan_drawback_share_title")
- private String weiquanDrawbackShareTitle;
-
- @Map("weiquan_drawback_share_msg")
- private String weiquanDrawbackShareMsg;
-
- @Map("weiquan_drawback_share_push")
- private String weiquanDrawbackSharePush;
-
- // 鎻愪氦鎻愮幇鐢宠
- @Map("extract_applay_title")
- private String extractApplayTitle;
- @Map("extract_applay_push")
- private String extractApplayPush;
- @Map("extract_applay_msg")
- private String extractApplayMsg;
-
- // 鎻愮幇鐢宠涓嶆垚鍔燂紝璐﹀彿鏈夎
- @Map("extract_transfer_fail_title")
- private String extractTransferFailTitle;
-
- @Map("extract_transfer_fail_push")
- private String extractTransferFailPush;
-
- @Map("extract_transfer_fail_msg")
- private String extractTransferFailMsg;
-
- // 鎻愮幇涓嶆垚鍔燂紝璐︽埛鍑虹幇閿欒
- @Map("extract_wrong_title")
- private String extractWrongTitle;
-
- @Map("extract_wrong_push")
- private String extractWrongPush;
-
- @Map("extract_wrong_msg")
- private String extractWrongMsg;
// 鎻愮幇鎴愬姛
- @Map("extract_success_title")
- private String extractSuccessTitle;
-
- @Map("extract_success_push")
- private String extractSuccessPush;
-
- @Map("extract_success_msg")
- private String extractSuccessMsg;
+ @Map("money_extract_success_title")
+ private String moneyExtractSuccessTitle;
+ @Map("money_extract_success_msg")
+ private String moneyExtractSuccessMsg;
- //鏀粯瀹濊处鎴烽獙璇�
- @Map("alipay_account_valid_title")
- private String alipayAccountValidTitle;
+ // 绯荤粺琛ラ綈
+ @Map("money_system_compensate_title")
+ private String moneySystemCompensateTitle;
+ @Map("money_system_compensate_msg")
+ private String moneySystemCompensateMsg;
+
+
+ // 閭�璇烽槦鍛樻垚鍔�
+ @Map("invite_team_success_title")
+ private String inviteTeamSuccessTitle;
+ @Map("invite_team_success_msg")
+ private String inviteTeamSuccessMsg;
- @Map("alipay_account_valid_msg")
- private String alipayAccountValidMsg;
-
-
+ //绯荤粺娑堟伅
+ @Map("system_message_title")
+ private String systemMessageTitle;
+ @Map("system_message_msg")
+ private String systemMessageMsg;
- public String getInviteMoneyRecieveTitle() {
- return inviteMoneyRecieveTitle;
+ public String getMoneyTeamDividentsRecievedTitle() {
+ return moneyTeamDividentsRecievedTitle;
}
- public void setInviteMoneyRecieveTitle(String inviteMoneyRecieveTitle) {
- this.inviteMoneyRecieveTitle = inviteMoneyRecieveTitle;
+ public void setMoneyTeamDividentsRecievedTitle(String moneyTeamDividentsRecievedTitle) {
+ this.moneyTeamDividentsRecievedTitle = moneyTeamDividentsRecievedTitle;
}
- public String getInviteMoneyRecievePush() {
- return inviteMoneyRecievePush;
+ public String getMoneyTeamDividentsRecievedMsg() {
+ return moneyTeamDividentsRecievedMsg;
}
- public void setInviteMoneyRecievePush(String inviteMoneyRecievePush) {
- this.inviteMoneyRecievePush = inviteMoneyRecievePush;
+ public void setMoneyTeamDividentsRecievedMsg(String moneyTeamDividentsRecievedMsg) {
+ this.moneyTeamDividentsRecievedMsg = moneyTeamDividentsRecievedMsg;
}
- public String getInviteMoneyRecieveMsg() {
- return inviteMoneyRecieveMsg;
+ public String getMoneyTearcherSubsidyRecievedTitle() {
+ return moneyTearcherSubsidyRecievedTitle;
}
- public void setInviteMoneyRecieveMsg(String inviteMoneyRecieveMsg) {
- this.inviteMoneyRecieveMsg = inviteMoneyRecieveMsg;
+ public void setMoneyTearcherSubsidyRecievedTitle(String moneyTearcherSubsidyRecievedTitle) {
+ this.moneyTearcherSubsidyRecievedTitle = moneyTearcherSubsidyRecievedTitle;
}
- public String getShareMoneyRecieveTitle() {
- return shareMoneyRecieveTitle;
+ public String getMoneyTearcherSubsidyRecievedMsg() {
+ return moneyTearcherSubsidyRecievedMsg;
}
- public void setShareMoneyRecieveTitle(String shareMoneyRecieveTitle) {
- this.shareMoneyRecieveTitle = shareMoneyRecieveTitle;
- }
-
- public String getShareMoneyRecievePush() {
- return shareMoneyRecievePush;
- }
-
- public void setShareMoneyRecievePush(String shareMoneyRecievePush) {
- this.shareMoneyRecievePush = shareMoneyRecievePush;
- }
-
- public String getShareMoneyRecieveMsg() {
- return shareMoneyRecieveMsg;
- }
-
- public void setShareMoneyRecieveMsg(String shareMoneyRecieveMsg) {
- this.shareMoneyRecieveMsg = shareMoneyRecieveMsg;
- }
-
- public String getWeiquanDrawbackInviteTitle() {
- return weiquanDrawbackInviteTitle;
- }
-
- public void setWeiquanDrawbackInviteTitle(String weiquanDrawbackInviteTitle) {
- this.weiquanDrawbackInviteTitle = weiquanDrawbackInviteTitle;
- }
-
- public String getWeiquanDrawbackInviteMsg() {
- return weiquanDrawbackInviteMsg;
- }
-
- public void setWeiquanDrawbackInviteMsg(String weiquanDrawbackInviteMsg) {
- this.weiquanDrawbackInviteMsg = weiquanDrawbackInviteMsg;
- }
-
- public String getWeiquanDrawbackInvitePush() {
- return weiquanDrawbackInvitePush;
- }
-
- public void setWeiquanDrawbackInvitePush(String weiquanDrawbackInvitePush) {
- this.weiquanDrawbackInvitePush = weiquanDrawbackInvitePush;
- }
-
- public String getAlipayAccountValidTitle() {
- return alipayAccountValidTitle;
- }
-
- public void setAlipayAccountValidTitle(String alipayAccountValidTitle) {
- this.alipayAccountValidTitle = alipayAccountValidTitle;
- }
-
- public String getAlipayAccountValidMsg() {
- return alipayAccountValidMsg;
- }
-
- public void setAlipayAccountValidMsg(String alipayAccountValidMsg) {
- this.alipayAccountValidMsg = alipayAccountValidMsg;
+ public void setMoneyTearcherSubsidyRecievedMsg(String moneyTearcherSubsidyRecievedMsg) {
+ this.moneyTearcherSubsidyRecievedMsg = moneyTearcherSubsidyRecievedMsg;
}
public String getFanliOrderStatisticedTitle() {
@@ -230,14 +116,6 @@
this.fanliOrderStatisticedTitle = fanliOrderStatisticedTitle;
}
- public String getFanliOrderStatisticedPush() {
- return fanliOrderStatisticedPush;
- }
-
- public void setFanliOrderStatisticedPush(String fanliOrderStatisticedPush) {
- this.fanliOrderStatisticedPush = fanliOrderStatisticedPush;
- }
-
public String getFanliOrderStatisticedMsg() {
return fanliOrderStatisticedMsg;
}
@@ -246,225 +124,132 @@
this.fanliOrderStatisticedMsg = fanliOrderStatisticedMsg;
}
- public String getTichengOrderStatisticedTitle() {
- return tichengOrderStatisticedTitle;
+ public String getShareOrderStatisticedTitle() {
+ return shareOrderStatisticedTitle;
}
- public void setTichengOrderStatisticedTitle(String tichengOrderStatisticedTitle) {
- this.tichengOrderStatisticedTitle = tichengOrderStatisticedTitle;
+ public void setShareOrderStatisticedTitle(String shareOrderStatisticedTitle) {
+ this.shareOrderStatisticedTitle = shareOrderStatisticedTitle;
}
- public String getTichengOrderStatisticedPush() {
- return tichengOrderStatisticedPush;
+ public String getShareOrderStatisticedMsg() {
+ return shareOrderStatisticedMsg;
}
- public void setTichengOrderStatisticedPush(String tichengOrderStatisticedPush) {
- this.tichengOrderStatisticedPush = tichengOrderStatisticedPush;
+ public void setShareOrderStatisticedMsg(String shareOrderStatisticedMsg) {
+ this.shareOrderStatisticedMsg = shareOrderStatisticedMsg;
}
- public String getTichengOrderStatisticedMsg() {
- return tichengOrderStatisticedMsg;
+ public String getInviteOrderStatisticedTitle() {
+ return inviteOrderStatisticedTitle;
}
- public void setTichengOrderStatisticedMsg(String tichengOrderStatisticedMsg) {
- this.tichengOrderStatisticedMsg = tichengOrderStatisticedMsg;
+ public void setInviteOrderStatisticedTitle(String inviteOrderStatisticedTitle) {
+ this.inviteOrderStatisticedTitle = inviteOrderStatisticedTitle;
}
- public String getNewerHongbaoTitle() {
- return newerHongbaoTitle;
+ public String getInviteOrderStatisticedMsg() {
+ return inviteOrderStatisticedMsg;
}
- public void setNewerHongbaoTitle(String newerHongbaoTitle) {
- this.newerHongbaoTitle = newerHongbaoTitle;
+ public void setInviteOrderStatisticedMsg(String inviteOrderStatisticedMsg) {
+ this.inviteOrderStatisticedMsg = inviteOrderStatisticedMsg;
}
- public String getExtractApplayMsg() {
- return extractApplayMsg;
+ public String getMoneyFanliRecievedTitle() {
+ return moneyFanliRecievedTitle;
}
- public void setExtractApplayMsg(String extractApplayMsg) {
- this.extractApplayMsg = extractApplayMsg;
+ public void setMoneyFanliRecievedTitle(String moneyFanliRecievedTitle) {
+ this.moneyFanliRecievedTitle = moneyFanliRecievedTitle;
}
- public String getOrderFanliRecieveTitle() {
- return orderFanliRecieveTitle;
+ public String getMoneyFanliRecievedMsg() {
+ return moneyFanliRecievedMsg;
}
- public void setOrderFanliRecieveTitle(String orderFanliRecieveTitle) {
- this.orderFanliRecieveTitle = orderFanliRecieveTitle;
+ public void setMoneyFanliRecievedMsg(String moneyFanliRecievedMsg) {
+ this.moneyFanliRecievedMsg = moneyFanliRecievedMsg;
}
-
-
- public String getWeiquanDrawbackFanliTitle() {
- return weiquanDrawbackFanliTitle;
+ public String getMoneyShareRecievedTitle() {
+ return moneyShareRecievedTitle;
}
- public void setWeiquanDrawbackFanliTitle(String weiquanDrawbackFanliTitle) {
- this.weiquanDrawbackFanliTitle = weiquanDrawbackFanliTitle;
+ public void setMoneyShareRecievedTitle(String moneyShareRecievedTitle) {
+ this.moneyShareRecievedTitle = moneyShareRecievedTitle;
}
- public String getExtractApplayTitle() {
- return extractApplayTitle;
+ public String getMoneyShareRecievedMsg() {
+ return moneyShareRecievedMsg;
}
- public void setExtractApplayTitle(String extractApplayTitle) {
- this.extractApplayTitle = extractApplayTitle;
+ public void setMoneyShareRecievedMsg(String moneyShareRecievedMsg) {
+ this.moneyShareRecievedMsg = moneyShareRecievedMsg;
}
- public String getExtractTransferFailTitle() {
- return extractTransferFailTitle;
+ public String getMoneySystemCompensateTitle() {
+ return moneySystemCompensateTitle;
}
- public void setExtractTransferFailTitle(String extractTransferFailTitle) {
- this.extractTransferFailTitle = extractTransferFailTitle;
+ public void setMoneySystemCompensateTitle(String moneySystemCompensateTitle) {
+ this.moneySystemCompensateTitle = moneySystemCompensateTitle;
}
- public String getExtractWrongTitle() {
- return extractWrongTitle;
+ public String getMoneySystemCompensateMsg() {
+ return moneySystemCompensateMsg;
}
- public void setExtractWrongTitle(String extractWrongTitle) {
- this.extractWrongTitle = extractWrongTitle;
+ public void setMoneySystemCompensateMsg(String moneySystemCompensateMsg) {
+ this.moneySystemCompensateMsg = moneySystemCompensateMsg;
}
- public String getExtractSuccessTitle() {
- return extractSuccessTitle;
+ public String getMoneyExtractSuccessTitle() {
+ return moneyExtractSuccessTitle;
}
- public void setExtractSuccessTitle(String extractSuccessTitle) {
- this.extractSuccessTitle = extractSuccessTitle;
+ public void setMoneyExtractSuccessTitle(String moneyExtractSuccessTitle) {
+ this.moneyExtractSuccessTitle = moneyExtractSuccessTitle;
}
- public String getNewerHongbaoPush() {
- return newerHongbaoPush;
+ public String getMoneyExtractSuccessMsg() {
+ return moneyExtractSuccessMsg;
}
- public void setNewerHongbaoPush(String newerHongbaoPush) {
- this.newerHongbaoPush = newerHongbaoPush;
+ public void setMoneyExtractSuccessMsg(String moneyExtractSuccessMsg) {
+ this.moneyExtractSuccessMsg = moneyExtractSuccessMsg;
}
- public String getNewerHongbaoMsg() {
- return newerHongbaoMsg;
+ public String getInviteTeamSuccessTitle() {
+ return inviteTeamSuccessTitle;
}
- public void setNewerHongbaoMsg(String newerHongbaoMsg) {
- this.newerHongbaoMsg = newerHongbaoMsg;
+ public void setInviteTeamSuccessTitle(String inviteTeamSuccessTitle) {
+ this.inviteTeamSuccessTitle = inviteTeamSuccessTitle;
}
- public String getOrderFanliRecievePush() {
- return orderFanliRecievePush;
+ public String getInviteTeamSuccessMsg() {
+ return inviteTeamSuccessMsg;
}
- public void setOrderFanliRecievePush(String orderFanliRecievePush) {
- this.orderFanliRecievePush = orderFanliRecievePush;
+ public void setInviteTeamSuccessMsg(String inviteTeamSuccessMsg) {
+ this.inviteTeamSuccessMsg = inviteTeamSuccessMsg;
}
- public String getOrderFanliRecieveMsg() {
- return orderFanliRecieveMsg;
+ public String getMoneyInviteRecievedTitle() {
+ return moneyInviteRecievedTitle;
}
- public void setOrderFanliRecieveMsg(String orderFanliRecieveMsg) {
- this.orderFanliRecieveMsg = orderFanliRecieveMsg;
+ public void setMoneyInviteRecievedTitle(String moneyInviteRecievedTitle) {
+ this.moneyInviteRecievedTitle = moneyInviteRecievedTitle;
}
-
- public String getWeiquanDrawbackFanliMsg() {
- return weiquanDrawbackFanliMsg;
+ public String getMoneyInviteRecievedMsg() {
+ return moneyInviteRecievedMsg;
}
- public void setWeiquanDrawbackFanliMsg(String weiquanDrawbackFanliMsg) {
- this.weiquanDrawbackFanliMsg = weiquanDrawbackFanliMsg;
- }
-
- public String getWeiquanDrawbackShareMsg() {
- return weiquanDrawbackShareMsg;
- }
-
- public void setWeiquanDrawbackShareMsg(String weiquanDrawbackShareMsg) {
- this.weiquanDrawbackShareMsg = weiquanDrawbackShareMsg;
- }
-
- public String getExtractApplayPush() {
- return extractApplayPush;
- }
-
- public void setExtractApplayPush(String extractApplayPush) {
- this.extractApplayPush = extractApplayPush;
- }
-
-
-
- public String getExtractTransferFailPush() {
- return extractTransferFailPush;
- }
-
- public void setExtractTransferFailPush(String extractTransferFailPush) {
- this.extractTransferFailPush = extractTransferFailPush;
- }
-
- public String getExtractTransferFailMsg() {
- return extractTransferFailMsg;
- }
-
- public void setExtractTransferFailMsg(String extractTransferFailMsg) {
- this.extractTransferFailMsg = extractTransferFailMsg;
- }
-
- public String getExtractWrongPush() {
- return extractWrongPush;
- }
-
- public void setExtractWrongPush(String extractWrongPush) {
- this.extractWrongPush = extractWrongPush;
- }
-
- public String getExtractWrongMsg() {
- return extractWrongMsg;
- }
-
- public void setExtractWrongMsg(String extractWrongMsg) {
- this.extractWrongMsg = extractWrongMsg;
- }
-
- public String getExtractSuccessPush() {
- return extractSuccessPush;
- }
-
- public void setExtractSuccessPush(String extractSuccessPush) {
- this.extractSuccessPush = extractSuccessPush;
- }
-
- public String getExtractSuccessMsg() {
- return extractSuccessMsg;
- }
-
- public void setExtractSuccessMsg(String extractSuccessMsg) {
- this.extractSuccessMsg = extractSuccessMsg;
- }
-
- public String getWeiquanDrawbackFanliPush() {
- return weiquanDrawbackFanliPush;
- }
-
- public void setWeiquanDrawbackFanliPush(String weiquanDrawbackFanliPush) {
- this.weiquanDrawbackFanliPush = weiquanDrawbackFanliPush;
- }
-
- public String getWeiquanDrawbackShareTitle() {
- return weiquanDrawbackShareTitle;
- }
-
- public void setWeiquanDrawbackShareTitle(String weiquanDrawbackShareTitle) {
- this.weiquanDrawbackShareTitle = weiquanDrawbackShareTitle;
- }
-
- public String getWeiquanDrawbackSharePush() {
- return weiquanDrawbackSharePush;
- }
-
- public void setWeiquanDrawbackSharePush(String weiquanDrawbackSharePush) {
- this.weiquanDrawbackSharePush = weiquanDrawbackSharePush;
+ public void setMoneyInviteRecievedMsg(String moneyInviteRecievedMsg) {
+ this.moneyInviteRecievedMsg = moneyInviteRecievedMsg;
}
}
--
Gitblit v1.8.0