Resolved conflict

This commit is contained in:
rajesh
2025-06-19 19:59:06 +05:30
30 changed files with 1891 additions and 1296 deletions

View File

@@ -83,7 +83,7 @@ sviluppumbria.username=protocollatoresvilumbria
password=8e85ea4265e49497d697168fd3d34916
CLASSIFICA=06.004.3
TIPO_PROTOCOLLAZIONE=E
tipoCorrispondenteCompany=PersonaGiuridica
tipoCorrispondenteCompany=PersonaGiuridica
tipoCorrispondenteWithoutCompany=Persona
mezzo=Altro
indirizzoPec=ufficio01@domain.com

View File

@@ -2960,4 +2960,24 @@
path="db/dump/updated_form_field_05_06_2025.sql"/>
</changeSet>
<changeSet id="06-06-2025_RK_180524" author="Rajesh Khore">
<createTable tableName="ndganag">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints primaryKey="true" primaryKeyName="ndganag_pkey" nullable="false"/>
</column>
<column name="ndg" type="VARCHAR(255)" />
<column name="company_name" type="VARCHAR(255)"/>
<column name="vat_number" type="VARCHAR(255)" />
<column name="codice_fiscale" type="VARCHAR(255)" />
<column name="json" type="TEXT"/>
<column name="is_deleted" type="BOOLEAN"/>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addColumn tableName="application">
<column name="pec_email" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
</databaseChangeLog>

View File

@@ -408,3 +408,5 @@ resend.email.sent.failed.msg = Failed to resend the email.
application.readmit.success=Application has been readmitted successfully.
no.email.log.msg = No failed emails found for given userActionId.
user.action.id.not.found = User Action id not found.
ndg.not.found=NDG not found.
email.pec.cannot.null=Email pec is required.

View File

@@ -399,3 +399,5 @@ resend.email.sent.failed.msg = Impossibile inviare nuovamente l'e-mail.
application.readmit.success=L'applicazione è stata riammessa con successo.
no.email.log.msg = Nessuna email trovata per userActionId specificato.
user.action.id.not.found = ID azione utente non trovato.
ndg.not.found=NDG non trovato.
email.pec.cannot.null=L'indirizzo email pec è obbligatorio.