Resolved conflicts

This commit is contained in:
Piyush
2025-02-14 13:04:55 +05:30
43 changed files with 954 additions and 213 deletions

View File

@@ -2391,4 +2391,42 @@
</changeSet>
<changeSet id="06-02-2025_NK_155519" author="Nisha Kashyap">
<addColumn tableName="call">
<column name="number_of_check" type="numeric"></column>
<column name="product_id" type="numeric"></column>
</addColumn>
</changeSet>
<changeSet id="06-02-2025_PK_165700" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_06-02-2025.sql"/>
</changeSet>
<changeSet id="11-02-2025_RK_111500" author="Rajesh Khore">
<addColumn tableName="system_email_template">
<column name="hub_id" type="INTEGER">
<constraints foreignKeyName="fk_hub_id"
references="hub(id)" />
</column>
</addColumn>
</changeSet>
<changeSet id="11-02-2025_RK_111515" author="Rajesh Khore">
<sql dbms="postgresql">select
setval('gepafin_schema.system_email_template_id_seq', (select
max(id)+1
from gepafin_schema.system_email_template), false)
</sql>
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql"/>
</changeSet>
<changeSet id="11-02-2025_NK_180615" author="Nisha Kashyap">
<modifyDataType tableName="call" columnName="number_of_check" newDataType="INTEGER"/>
<modifyDataType tableName="call" columnName="product_id" newDataType="INTEGER"/>
</changeSet>
</databaseChangeLog>