Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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;

   }



}