summaryrefslogtreecommitdiffstats
path: root/back/odiparback/src/main
diff options
context:
space:
mode:
authorDayana31 <[email protected]>2022-06-05 23:30:20 -0500
committerDayana31 <[email protected]>2022-06-05 23:30:20 -0500
commitaeca067db6bcec49d7852fc28ad7a8107c1f07b6 (patch)
tree53388039ef51db2795c298c8a7ed61461f0120e6 /back/odiparback/src/main
parentb76694b364e99ceb7a3616de88f0d7b5ff728859 (diff)
parent3a91d18704ee5ac783b398b1589ee2b14ea35321 (diff)
downloadDP1_project-aeca067db6bcec49d7852fc28ad7a8107c1f07b6.tar.gz
DP1_project-aeca067db6bcec49d7852fc28ad7a8107c1f07b6.tar.bz2
DP1_project-aeca067db6bcec49d7852fc28ad7a8107c1f07b6.zip
Merge branch 'gabshr' into dayana
Diffstat (limited to 'back/odiparback/src/main')
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java8
-rw-r--r--back/odiparback/src/main/resources/application.properties2
2 files changed, 9 insertions, 1 deletions
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java
index 28a970d..7c66069 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java
@@ -49,8 +49,16 @@ public class Camion {
@Column(name = "estado")
private int estado = 0; //0:
+ @Column(name = "codigo")
+ private String codigo; //0:
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "tipoCamion_fk")
private TipoCamion tipoCamion;
+ @Column(name = "activo")
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private int activo = 1;
+
+
}
diff --git a/back/odiparback/src/main/resources/application.properties b/back/odiparback/src/main/resources/application.properties
index a3dfce2..58bbefc 100644
--- a/back/odiparback/src/main/resources/application.properties
+++ b/back/odiparback/src/main/resources/application.properties
@@ -18,4 +18,4 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph
#spring.jpa.generate-ddl=true
#spring.jpa.hibernate.hbm2ddl.auto=update
-#spring.jpa.hibernate.ddl-auto=update \ No newline at end of file
+#spring.jpa.hibernate.ddl-auto=update