From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Crew.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Crew.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Crew.java
index fd60403..f4219a2 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Crew.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Crew.java
@@ -36,17 +36,23 @@
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "浜哄憳鐝粍缁存姢琛�")
 public class Crew extends Model<Crew> {
-private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    /**
-     * id
-     */
-    @TableId
-    @ApiModelProperty(value="id")
-    private Long id;
-    /**
-     * 鐝粍鍚嶇О
-     */
-    @ApiModelProperty(value="鐝粍鍚嶇О")
-    private String crewName;
-    }
+	/**
+	 * id
+	 */
+	@TableId
+	@ApiModelProperty(value = "id")
+	private Long id;
+	/**
+	 * 鐝粍鍚嶇О
+	 */
+	@ApiModelProperty(value = "鐝粍鍚嶇О")
+	private String crewName;
+
+	/**
+	 * 杞﹂棿
+	 */
+	@ApiModelProperty(value = "杞﹂棿")
+	private String workShop;
+}

--
Gitblit v1.9.3