Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/dataStatistics/goodsOrderList/index.vue

@@ -114,7 +114,7 @@
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
           </div>
           <div style="padding:10px 10px;font-size:12px;">备注：{{item.Remark}}</div>
-          <div style="text-align: right;font-size: 12px;">城的空间.诚咖啡</div>
+          <div style="text-align: right;font-size: 12px;">城的空间.城咖啡</div>
           <div style="height:10px"></div>
         </div>
       </tr>

src/pages/system/newOrder/newOrderList/index.vue

@@ -65,7 +65,7 @@
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
           </div>
           <div style="padding:10px 10px;font-size:12px;">备注：{{item.Remark}}</div>
-          <div style="text-align: right;font-size: 12px;">城的空间.诚咖啡</div>
+          <div style="text-align: right;font-size: 12px;">城的空间.城咖啡</div>
           <div style="height:10px"></div>
         </div>
         <div class="btns">