Resolved conflicts

2024-11-26 19:51:14 +05:30
parent 6d2374c3e6 04aaa23c2c
commit f0c6bc2a01
16 changed files with 517 additions and 328 deletions
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -1798,6 +1798,11 @@
            <where>role_type = 'ROLE_PRE_INSTRUCTOR'</where>
        </update>
    </changeSet>
+<changeSet id="22-11-2024_1" author="Rajesh Khore">
+        <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">
@@ -1821,4 +1826,5 @@
            </column>
        </addColumn>
    </changeSet>
+
 </databaseChangeLog>