resolved conflicts

2024-10-17 16:05:30 +05:30
parent 4412e447fb 863e2db68d
commit 01e589ec6d
23 changed files with 174 additions and 28 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
@@ -1138,4 +1138,12 @@
                                 constraintName="fk_criteria_form_field_evaluation_criteria_id"
                                 onDelete="CASCADE"/>
    </changeSet>
+    
+    <changeSet id="16-10-2024_1" author="Harish Bagora">
+        <addColumn tableName="user_with_company">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>