1、解决合并冲突问题

lib/pages/facial_recognition/controller.dart

@@ -485,7 +485,7 @@ class FacialRecognitionController extends GetxController
       idCardInfo.idCardNumber = patientInfo!.cardNo!;
       if (patientInfo?.photos?.isNotEmpty ?? false) {
         ///已经绑定则解绑
-        await rpc.patient.unbindByCardNoAsync(UnbindByCardNoRequest(
+        await rpc.vitalPatient.unbindByCardNoAsync(UnbindByCardNoRequest(
           token: Store.user.token,
           cardNo: patientInfo!.cardNo!,
         ));