From 1c4c5c5cb829334303bff98837a69a9653dca714 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 17:09:49 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon

---
 System/Welfare/ConsumeRebateModel.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Welfare/ConsumeRebateModel.cs b/System/Welfare/ConsumeRebateModel.cs
index 6c6638d..87a3e79 100644
--- a/System/Welfare/ConsumeRebateModel.cs
+++ b/System/Welfare/ConsumeRebateModel.cs
@@ -57,7 +57,7 @@
         {
             get
             {
-                return consumeRebateRedpoint.state == RedPointState.Simple;
+                return consumeRebateRedpoint.state == RedPointState.GetReward;
             }
         }
 
@@ -208,7 +208,7 @@
                         {
                             continue;
                         }
-                        consumeRebateRedpoint.state = RedPointState.Simple;
+                        consumeRebateRedpoint.state = RedPointState.GetReward;
                         break;
                     }
                 }

--
Gitblit v1.8.0