From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/equipage/entity/Equipage.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/entity/Equipage.java b/src/main/java/org/springblade/modules/equipage/entity/Equipage.java
index 4cecff8..dc85e27 100644
--- a/src/main/java/org/springblade/modules/equipage/entity/Equipage.java
+++ b/src/main/java/org/springblade/modules/equipage/entity/Equipage.java
@@ -63,6 +63,7 @@
* 品牌，厂商
*/
private String brand;
+ private String jurisdiction;
/**
* 生产时间
@@ -72,6 +73,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date dateForProduction;
-
+ /**
+ * 责任人id
+ */
+ @TableField("user_id")
+ private Long userId;
}
--
Gitblit v1.9.3