Resolved conflicts
This commit is contained in:
@@ -1874,6 +1874,29 @@
|
||||
<addColumn tableName="application_evaluation">
|
||||
<column name="MOTIVATION" type="TEXT"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="26-11-2024_1" author="Rajesh Khore">
|
||||
<addColumn tableName="APPLICATION">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_APPLICATION" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
<dropForeignKeyConstraint baseTableName="APPLICATION" constraintName="fk_COMPANY_APPLICATION"/>
|
||||
<addColumn tableName="faq">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_faq" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
<addColumn tableName="beneficiary_preferred_call">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_beneficiary_preferred_call" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
<addColumn tableName="user_company_delegation">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_user_company_delegation" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="22-11-2024_2" author="Piyush">
|
||||
|
||||
Reference in New Issue
Block a user