解决冲突，使用他人版本

src/components/Hotel/singleProduct/ModifyHotelOrder.vue

@@ -254,8 +254,8 @@
       </div>
       <div>本次行程<span
           v-if="order.DetailList">{{ order.DetailList.length }}</span>天，入住<span>{{ order.HotelCount }}</span>个酒店</div>
-      <div>{{$t('objFill.dindianfukuan')}}：<span v-if="">
-         円</span><b v-if="order.Money">{{ moneyFormat(order.Money) }}</b></div>
+      <div>{{$t('objFill.dindianfukuan')}}：<span>
+          {{order.CurrencyCode}}</span><b v-if="order.Money">{{ moneyFormat(order.Money) }}</b></div>
       <div>
         <button class="hollowFixedBtn" @click="cancelOrder">取消订单</button>
         <button class="normalBtn" @click="saveOrderHandler">保存订单</button>