From b6480bb8991e83a2efd5e4835ccc8ed0e87c067a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 22 七月 2024 14:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingrecord/entity/TemperingRecord.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingrecord/entity/TemperingRecord.java
similarity index 91%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java
rename to hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingrecord/entity/TemperingRecord.java
index b11715c..0049269 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingrecord/entity/TemperingRecord.java
@@ -1,4 +1,4 @@
-package com.mes.tempering_record.entity;
+package com.mes.temperingrecord.entity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,6 +20,10 @@
private static final long serialVersionUID = 1L;
/**
+ * 宸ョ▼id
+ */
+ private String engineerId;
+ /**
* 閽㈠寲鐗堝浘
*/
private Integer temperingLayoutId;
--
Gitblit v1.8.0