Merge branch 'feature/giftCart' into release/6.1

@@ -28,7 +28,7 @@
         {{#if giftCardConsumeInfoBOList}}
         {{#if giftCardConsumeInfoBOList}}
             {{# giftCardConsumeInfoBOList}}
             {{# giftCardConsumeInfoBOList}}
                 <div class="me-gift-tr">
                 <div class="me-gift-tr">
-                    <div>{{dateFormat 'YYYY-MM-DD HH:mm' createTime}}</div>
+                    <div>{{dateFormat 'YYYY-MM-DD HH:mm:ss' createTime}}</div>
                     <div>{{orderCode}}</div>
                     <div>{{orderCode}}</div>
                     {{#isEqual type 1}}
                     {{#isEqual type 1}}
                         <div class="consume">消费</div>
                         <div class="consume">消费</div>

@@ -24,8 +24,8 @@
                                 <div>{{cardCode}}</div>
                                 <div>{{cardCode}}</div>
                                 <div>{{amount}}</div>
                                 <div>{{amount}}</div>
                                 <div>{{remainAmount}}</div>
                                 <div>{{remainAmount}}</div>
-                                <div>{{dateFormat 'YYYY-MM-DD HH:mm' activateTime}}</div>
-                                <div>{{dateFormat 'YYYY-MM-DD HH:mm' endTime}}</div>
+                                <div>{{dateFormat 'YYYY-MM-DD' activateTime}}</div>
+                                <div>{{dateFormat 'YYYY-MM-DD' endTime}}</div>
                                 <div class="info-list">消费明细</div>
                                 <div class="info-list">消费明细</div>
                             </div>
                             </div>
                         {{/giftData.data}}
                         {{/giftData.data}}