From c39cbe1bfb89a086826d2799fd35d4f46f8854f9 Mon Sep 17 00:00:00 2001
From: Harry Zhou <zhouziqun@cool2645.com>
Date: Sat, 17 Jun 2017 23:58:09 +0800
Subject: [PATCH 1/2] Fix Message time bug.

---
 resources/views/message/message.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/message/message.blade.php b/resources/views/message/message.blade.php
index 9d892d8..95326e3 100644
--- a/resources/views/message/message.blade.php
+++ b/resources/views/message/message.blade.php
@@ -70,7 +70,7 @@
                             <p v-if="contact_id == 0" class="message-content" v-html="message.content"></p>
                             <p v-else class="message-content">@{{ message.content }}</p>
                             <br/><br/>
-                        <i class="time-tag">@{{ message.updated_at }}</i>
+                        <i class="time-tag">@{{ message.created_at }}</i>
                         </span>
                             <span v-else>
                             <i class="history-text">以上是历史消息</i>

From d9b1d1eba8ed53dde29200857d917edcb0adc632 Mon Sep 17 00:00:00 2001
From: LI JIAHAO <lijiahao99131@gmail.com>
Date: Sun, 18 Jun 2017 00:07:43 +0800
Subject: [PATCH 2/2] fix test

---
 tests/GoodTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/GoodTest.php b/tests/GoodTest.php
index 1fa4a02..0a4f4cd 100644
--- a/tests/GoodTest.php
+++ b/tests/GoodTest.php
@@ -38,7 +38,7 @@ class GoodTest extends BrowserKitTestCase
             ->see('库存数必须是整数')
             ->type('10', 'count')
             ->press('添加')
-            ->see('必须为商品上传一张图片')
+            ->see('必须为商品上传封面')
             ->attach(__DIR__ . '/resources/good.jpg', 'goodTitlePic')
             ->press('添加')
             ->see('请按要求裁剪图片')