Resolved conflicts

2025-08-01 13:37:35 +05:30
parent 26701bae8b 2521eb9cc8
commit b10a91291d
42 changed files with 952 additions and 120 deletions
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -575,6 +575,8 @@ public class GepafinConstant {
    public static final String NDG_NOT_FOUND="ndg.not.found";
    public static final String EMAIL_PEC_REQUIRED="email.pec.cannot.null";
    public static final String COMPANY_NAME_JSON="denominazione";
+    public static final String USER_REQUEST_COMPLETED="user.request.completed";
+    public static final String END_DATE_GREATER_THAN_NOW="end.date.greater.than.now";

 }