解决合并冲突

openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue

@@ -753,6 +753,7 @@ const transformFormData = (form) => {
     price,
     description,
     ybType,
+    ybNo,
     title,
     comment,
     practitionerId,
@@ -769,6 +770,7 @@ const transformFormData = (form) => {
       // locationId,
       name,
       contact,
+      ybNo,
       appointmentRequiredFlag,
       extraDetails,
       comment,
@@ -782,6 +784,7 @@ const transformFormData = (form) => {
       description,
       typeCode: cwTypeCode,
       ybType,
+      ybNo,
       price,
     },
   };
@@ -807,6 +810,7 @@ const transformFormEditData = (form) => {
     price,
     description,
     ybType,
+    ybNo,
     title,
     comment,
     practitionerId,
@@ -823,6 +827,7 @@ const transformFormEditData = (form) => {
       // locationId,
       name,
       contact,
+      ybNo,
       appointmentRequiredFlag,
       extraDetails,
       comment,