Resolved conflicts

This commit is contained in:
rajesh
2025-11-18 15:03:16 +05:30
5 changed files with 14 additions and 13 deletions

View File

@@ -2999,7 +2999,7 @@
path="db/dump/insert_system_email_template_technical_evaluation_rejected.sql"/>
</changeSet>
<changeSet id="02-07_2025_RK_162833" author="Rajesh Khore">
<changeSet id="02-07_2025_RK_162833" author="Rajesh Khore">
<addColumn tableName="application">
<column name="vat_number" type="VARCHAR(255)"></column>
</addColumn>
@@ -3008,7 +3008,7 @@
<changeSet id="02-07-2025_RK_152053" author="Rajesh Khore">
<addColumn tableName="call">
<column name="allow_multiple_applications" type="BOOLEAN" defaultValueBoolean="false"></column>
</addColumn>
</addColumn>
</changeSet>
<changeSet id="08-07-2025_RK_152945" author="Rajesh Khore">
@@ -3069,7 +3069,8 @@
<where>UNIQUE_UUID = 'p4lk3bcx1RStqTaIVVbXs'</where>
</update>
</changeSet>
<changeSet id="06-10-2025_RK_142435" author="Rajesh Khore">
<changeSet id="06-10-2025_RK_142435" author="Rajesh Khore">
<addColumn tableName="application">
<column name="previous_status" type="VARCHAR(255)"></column>
</addColumn>
@@ -3092,11 +3093,7 @@
<sqlFile dbms="postgresql" path="db/dump/update_system_email_template_of_application_rejected_17_10_2025.sql"/>
</changeSet>
<changeSet id="18-09-2025_RK_124523" author="Rajesh Khore">
<addColumn tableName="application_signed_document">
<column name="document_attachment_id" type="TEXT"></column>
</addColumn>
</changeSet>
<changeSet id="23-10-2025_RK_151527" author="Rajesh Khore">
<sqlFile dbms="postgresql" path="db/dump/update_document_for_special_amendment_23-10-2025.sql"/>
</changeSet>