Resolved conflicts

2025-10-14 11:58:13 +05:30
parent 38515ed38b 159c2611d3
commit 58f36c954d
5 changed files with 29 additions and 17 deletions
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -26,7 +26,7 @@ default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
 #Login to Odessa, Appointment Creation, Upload document Configuration
 appointment.base.url=https://prd.galileonetwork.it/gateway/rest
 appointment.portal.user=UtenzaAPIPortal@621
-appointment.portal.password=Valeria2016!!
+appointment.portal.password=Valeria2016!
 appointment.portal.source=GEPAFINPORTAL
 appointment.portal.context=GEPAFINPORTAL

--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -3069,4 +3069,9 @@
        <where>UNIQUE_UUID = 'p4lk3bcx1RStqTaIVVbXs'</where>
    </update>
    </changeSet>
+    <changeSet id="06-10-2025_RK_142435" author="Rajesh Khore">
+        <addColumn tableName="application">
+            <column name="previous_status" type="VARCHAR(255)"></column>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>