Merge branch 'dev/v2.4.32_wmh' of jianyu/qmx_page_admin into feature/v2.4.32

src/views/order/components/otherOrderEdit.vue

@@ -1511,6 +1511,7 @@ export default {
         }else{
           this.finish_dis=false
         }
+        this.serviceEndTime =res.vip_endtime?dateFormatter(res.vip_endtime, 'yyyy-MM-dd') : ''
         this.others = {
           orderCode: res.order_code,
           id: res.id,