resolved conflict

2024-10-08 17:40:22 +05:30
parent c7727254c2 d4f8d0251c
commit d9fa43f22a
10 changed files with 138 additions and 23 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationFormFieldRequestBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationFormFieldRequestBean.java
@@ -9,6 +9,6 @@ public class ApplicationFormFieldRequestBean  {
    
    private String fieldId;

-    private String fieldValue;
+    private Object fieldValue;

 }