Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/DAO/MessageHistory.php

@@ -104,7 +104,7 @@ class MessageHistoryModel extends \DAO\AbstractModel {
                     }
                 }
                 if($button['type']==ApiConst::messageButtonTypeConfirmButton ){
-                    if($timeDiff>(ApiConst::tenMinSecond-ApiConst::oneDaySecond)){
+                    if($timeDiff>(ApiConst::oneDaySecond)){
                         $button['showType']=ApiConst::messageButtonShowTypeGray;
                     }
                 }