resolved conflicts

2024-10-19 13:24:07 +05:30
parent 1ef693fd4b 1847ca1fe9
commit 1073c705f0
19 changed files with 314 additions and 51 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ContentResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ContentResponseBean.java
@@ -13,5 +13,7 @@ public class ContentResponseBean {
    private String label;
    private List<SettingResponseBean> settings;
    private Map<String,Object> validators;
+    private List<Long> criteria;
+    private String dynamicData;
    private Integer dbId;
 }