Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
Mina Ruggiero
2024-03-15 10:25:16 +01:00
parent 9708b36438 9e7b299a09
commit b6b5b5eaae
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-core/pom.xml
View File

@@ -394,18 +394,13 @@
<artifactId>utility-barcode</artifactId> <artifactId>utility-barcode</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<dependency>
<groupId>it.integry</groupId>
<artifactId>utilityImage</artifactId>
<version>1.0</version>
</dependency>
<!-- IntegryUtility (Barcodes, ecc) --> <!-- IntegryUtility (Barcodes, ecc) -->
<dependency> <dependency>
<groupId>it.integry</groupId> <groupId>it.integry</groupId>
<artifactId>Utility</artifactId> <artifactId>Utility</artifactId>
<version>1.4</version> <version>1.5</version>
</dependency> </dependency>

2
ems-core/src/main/java/it/integry/ems_model/entity/WtbJreptSetup.java
View File

@@ -1,5 +1,6 @@
package it.integry.ems_model.entity; package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import it.integry.ems_model.annotation.Identity; import it.integry.ems_model.annotation.Identity;
@@ -128,6 +129,7 @@ public class WtbJreptSetup extends EntityBase {
this.value = value; this.value = value;
} }
@JsonCreator
public static Tipo from(Object value) { public static Tipo from(Object value) {
int castValue = (int) value; int castValue = (int) value;
for (Tipo b : Tipo.values()) { for (Tipo b : Tipo.values()) {