Merge remote-tracking branch 'origin/dev' into dev

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java

@@ -30,6 +30,9 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
     @ApiModelProperty(value = "Полное наименование инструмента", example = "NAME A")
     @JsonProperty
     public String fullName;
+    @ApiModelProperty(value = "Нотация наименования инструмента", example = "NOTE")
+    @JsonProperty
+    public String convention;
     @ApiModelProperty(value = "Размер лота", example = "21.55")
     @JsonProperty
     public BigDecimal lotSize;
@@ -84,6 +87,7 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
         req.setNominalCurrency(this.getNominalCurrency());
         req.setInstrumentType(this.getInstrumentType());
         req.setFullName(this.getFullName());
+        req.setConvention(this.getConvention());
         req.setSecuritySymbol(this.getSecuritySymbol());
         req.setLotSize(this.getLotSize());
         req.setShortName(this.getShortName());
@@ -128,6 +132,14 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
         this.fullName = fullName;
     }
 
+    public String getConvention() {
+        return convention;
+    }
+
+    public void setConvention(String convention) {
+        this.convention = convention;
+    }
+
     public BigDecimal getLotSize() {
         return lotSize;
     }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java

@@ -32,6 +32,9 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
     @ApiModelProperty(value = "Полное наименование инструмента", example = "NAME A")
     @JsonProperty
     public String fullName;
+    @ApiModelProperty(value = "Нотация наименования инструмента", example = "NOTE")
+    @JsonProperty
+    public String convention;
     @ApiModelProperty(value = "Размер лота", example = "21.55")
     @JsonProperty
     public BigDecimal lotSize;
@@ -86,6 +89,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
         req.setNominalCurrency(this.getNominalCurrency());
         req.setInstrumentType(this.getInstrumentType());
         req.setFullName(this.getFullName());
+        req.setConvention(this.getConvention());
         req.setSecuritySymbol(this.getSecuritySymbol());
         req.setLotSize(this.getLotSize());
         req.setShortName(this.getShortName());
@@ -139,6 +143,14 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
         this.fullName = fullName;
     }
 
+    public String getConvention() {
+        return convention;
+    }
+
+    public void setConvention(String convention) {
+        this.convention = convention;
+    }
+
     public BigDecimal getLotSize() {
         return lotSize;
     }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java

@@ -33,6 +33,8 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi
     @JsonProperty
     public String fullName;
     @JsonProperty
+    public String convention;
+    @JsonProperty
     public String shortNameEng;
     @JsonProperty
     public String fullNameEng;
@@ -99,6 +101,14 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi
         this.fullName = fullName;
     }
 
+    public String getConvention() {
+        return convention;
+    }
+
+    public void setConvention(String convention) {
+        this.convention = convention;
+    }
+
     public String getShortName() {
         return shortName;
     }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java

@@ -35,6 +35,8 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi
     @JsonProperty
     public String fullName;
     @JsonProperty
+    public String convention;
+    @JsonProperty
     public String shortNameEng;
     @JsonProperty
     public String fullNameEng;
@@ -101,6 +103,14 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi
         this.fullName = fullName;
     }
 
+    public String getConvention() {
+        return convention;
+    }
+
+    public void setConvention(String convention) {
+        this.convention = convention;
+    }
+
     public String getShortName() {
         return shortName;
     }