From 5181dd6b0bc1f74d3659dad2440e5dde56b0361c Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 5 Sep 2024 17:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=85=AC=E5=8F=B8=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A0=E6=94=B9=EF=BC=8C=E5=8F=8A=E5=85=B6=E4=BB=96BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiver-admin/test-output/test-report.html         | 16 ++++++++--------
 .../resources/mapper/LogisticsUserMapper.xml     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index e48df27b..0c0325b9 100644
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">八月 31, 2024 18:53:32</span></a>
+<a href="#"><span class="badge badge-primary">八月 31, 2024 22:16:34</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>18:53:32 下午</span> / <span>0.02 secs</span></p>
+            <p class="text-sm"><span>22:16:34 下午</span> / <span>0.016 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>08.31.2024 18:53:32</span>
-<span class='badge badge-danger'>08.31.2024 18:53:32</span>
-<span class='badge badge-default'>0.02 secs</span>
+<span class='badge badge-success'>08.31.2024 22:16:34</span>
+<span class='badge badge-danger'>08.31.2024 22:16:35</span>
+<span class='badge badge-default'>0.016 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>18:53:32</td>
+        <td>22:16:35</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>八月 31, 2024 18:53:32</h3>
+<h3>八月 31, 2024 22:16:34</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>八月 31, 2024 18:53:32</h3>
+<h3>八月 31, 2024 22:16:35</h3>
 </div></div>
 </div>
 <div class="col-md-3">
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml
index 9bbb8e16..46ffeb90 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml
@@ -11,7 +11,7 @@
     <result column="nick_name" jdbcType="VARCHAR" property="nickName" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
     <result column="company_id" jdbcType="VARCHAR" property="companyId" />
-    <result column="user_role" jdbcType="VARCHAR" property="usuerRole" />
+    <result column="user_role" jdbcType="VARCHAR" property="userRole" />
   </resultMap>
 
   <sql id="Base_Column_List">