From 05ab6e3f69a5e73624b2573db043f5923e8f7d8b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 14:17:19 +0800
Subject: [PATCH] fix 修复bug
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
index 528104c..02fa4cd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
@@ -28,13 +28,17 @@
private String permitType;
/** 浣滀笟鍚嶇О */
private String title;
- /** 浣滀笟鍖哄煙/杞﹂棿 */
+ /** 浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 浣滀笟杞﹂棿鍚嶇О锛堝揩鐓э紝鐢辫溅闂翠富鏁版嵁甯﹀嚭锛� */
private String workshopName;
/** 浣滀笟鍦扮偣 */
private String location;
/** 浣滀笟鍐呭涓庤寖鍥� */
private String workContent;
- /** 鐢宠浜� */
+ /** 鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long applicantId;
+ /** 鐢宠浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗ｆ甯﹀嚭锛� */
private String applicant;
/** 鐢宠鏃堕棿 */
private LocalDateTime applyTime;
@@ -50,13 +54,17 @@
private String riskLevel;
/** 瀹夊叏鎺柦 */
private String safetyMeasures;
- /** 瀹℃壒浜� */
+ /** 瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long approverId;
+ /** 瀹℃壒浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗ｆ甯﹀嚭锛� */
private String approver;
/** 瀹℃壒鏃堕棿 */
private LocalDateTime approveTime;
/** 瀹℃壒鎰忚 */
private String approveComment;
- /** 鐩戞姢浜� */
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗ｆ甯﹀嚭锛� */
private String guardian;
/** 鐘舵�侊紝瑙� SafetyPermitStatusEnum */
private String status;
--
Gitblit v1.9.3