Merge remote-tracking branch 'origin/test'

@@ -76,7 +76,7 @@ const (
 
 
 var (
 var (
 	MessageApproving      = "提交了一条%v机会消息,需要您审核"
 	MessageApproving      = "提交了一条%v机会消息,需要您审核"
-	MessageApproveSuccess = "审核通过你提交的%v机会"
+	MessageApproveSuccess = "审核通过您提交的%v机会"
 	MessageApproveReject  = "退回了您提交的%v机会"
 	MessageApproveReject  = "退回了您提交的%v机会"
 
 
 	MessageZanChance  = "点赞了您发布的机会"
 	MessageZanChance  = "点赞了您发布的机会"

@@ -14,9 +14,9 @@ import (
 
 
 var (
 var (
 	MessageApproving       = "提交了一条%v机会消息,需要您审核"
 	MessageApproving       = "提交了一条%v机会消息,需要您审核"
-	MessageApproveSuccess  = "审核通过你提交的%v机会"
+	MessageApproveSuccess  = "审核通过您提交的%v机会"
 	MessageApproveReject   = "退回了您提交的%v机会"
 	MessageApproveReject   = "退回了您提交的%v机会"
-	MessageApproveAutoPass = "自动审核通过你提交的%v机会"
+	MessageApproveAutoPass = "自动审核通过您提交的%v机会"
 )
 )
 
 
 //发送审批消息
 //发送审批消息

@@ -328,13 +328,13 @@ func MsgChanceApprove(header *protocol.RequestHeader, request *protocol.MsgChanc
 			commItem.Chance = item
 			commItem.Chance = item
 		}
 		}
 
 
-		if chance.ReviewStatus == protocol.ReviewStatusPass {
-			var approveData *protocol.ApproveData
-			utils.JsonUnmarshal(chance.ApproveData, &approveData)
-			if approveData != nil {
-				commItem.Score = approveData.Score
-			}
-		}
+		//if chance.ReviewStatus == protocol.ReviewStatusPass {
+		//	var approveData *protocol.ApproveData
+		//	utils.JsonUnmarshal(chance.ApproveData, &approveData)
+		//	if approveData != nil {
+		//		commItem.Score = approveData.Score
+		//	}
+		//}
 		commItem.MsgId = chance.Id
 		commItem.MsgId = chance.Id
 		commItem.MsgTime = chance.MsgTime.Unix() * 1000
 		commItem.MsgTime = chance.MsgTime.Unix() * 1000
 		//审核完有审核数据
 		//审核完有审核数据