From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
index 5cdd462..b18e7f7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
@@ -25,6 +25,11 @@
@Schema(description = "宸ュ簭鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "涓嬫枡宸ュ簭")
private String name;
+ @ExcelProperty(value = "鐢靛姏宸ヨ壓鍒嗙被", converter = DictConvert.class)
+ @DictFormat(cn.iocoder.yudao.module.mes.enums.DictTypeConstants.MES_PRO_PROCESS_TYPE)
+ @Schema(description = "鐢靛姏宸ヨ壓鍒嗙被", example = "2")
+ private Integer type;
+
@ExcelProperty("宸ヨ壓瑕佹眰")
@Schema(description = "宸ヨ壓瑕佹眰", example = "鎸夌収鍥剧焊灏哄杩涜鍒囧壊")
private String attention;
@@ -38,6 +43,12 @@
@Schema(description = "澶囨敞", example = "閲戝睘鏉挎潗涓嬫枡")
private String remark;
+ /** 閲囬泦鏂瑰紡锛�0 涓嶉噰闆嗭紝1 姣忔鎶ュ伐锛�2 浠诲姟鍏辩敤銆� */
+ private Integer paramCollectMode;
+
+ /** 宸ュ簭浣跨敤鐨勫伐鑹哄弬鏁版ā鏉跨紪鍙枫�� */
+ private Long paramTemplateId;
+
@ExcelProperty("鍒涘缓鏃堕棿")
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
--
Gitblit v1.9.3