处理冲突

a3051826 · David黄金龙 · 4b0f09f8 · a3051826
Commit a3051826 authored Aug 22, 2024 by David黄金龙
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

YHCertificateAppointViewController.swift ...cate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift +1 -0

No files found.
--- a/galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift
+++ b/galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift
@@ -110,6 +110,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
            items1.append(item3)
        }
        
+//        self.reservationToHK = 0//for test hjl
        if self.reservationToHK == 0 { // 没有预约过人员
            
            // 赴港激活签证 申请人是否统一赴港激活签证