From 578639bf4bb9be9808d7c482345b8c35b02510b7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 18 八月 2025 17:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/andon/dto/AndonButtonDTO.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/andon/dto/AndonButtonDTO.java b/src/main/java/org/jeecg/modules/andon/dto/AndonButtonDTO.java
new file mode 100644
index 0000000..044b1dd
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/andon/dto/AndonButtonDTO.java
@@ -0,0 +1,83 @@
+package org.jeecg.modules.andon.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+@Data
+public class AndonButtonDTO {
+    /** 鍝嶅簲ID */
+    @ApiModelProperty(value = "鍝嶅簲ID")
+    private String id;
+    /** 鎸夐挳ID */
+    @ApiModelProperty(value = " 鎸夐挳ID ")
+    private String buttonId;
+    /**瀹夌伅鍚嶇О*/
+    @ApiModelProperty(value = "瀹夌伅鍚嶇О")
+    private String buttonName;
+    /**瀹夌伅缂栫爜*/
+    @ApiModelProperty(value = "瀹夌伅缂栫爜")
+    private String buttonCode;
+    /** 涓�绾у搷搴斾汉 */
+    @ApiModelProperty(value = "涓�绾у搷搴斾汉")
+    private String responder;
+
+
+    @ApiModelProperty(value = "浜岀骇鍝嶅簲浜�")
+    private String secondResponder;
+    /**浜х嚎鍚嶇О*/
+    @ApiModelProperty(value = "浜х嚎鍚嶇О")
+    private String factoryName;
+
+    /**浜х嚎鍚嶇О*/
+    @ApiModelProperty(value = "宸ュ巶鍚嶇О")
+    private String parentFactoryName;
+
+    /**涓�绾у搷搴旀椂闀�*/
+    @ApiModelProperty(value = "涓�绾у搷搴旀椂闀�")
+    private Integer upgradeResponseDuration;
+
+
+
+    /**浜岀骇鍝嶅簲鏃堕暱*/
+    @ApiModelProperty(value = "浜岀骇鍝嶅簲鏃堕暱")
+    private Integer secondUpgradeResponseDuration;
+
+    /**涓夌骇绾у搷搴旀椂闀�*/
+    @ApiModelProperty(value = "涓夌骇鍝嶅簲鏃堕暱")
+    private Integer thirdUpgradeResponseDuration;
+
+    /**
+     * 鏄惁闂儊
+     * 瀵瑰簲鏁版嵁搴撹〃涓� is_blinking 瀛楁锛堝ぇ浜�0 鏈夊緟澶勭悊鐨勫伐鍗曢棯锛岀浉鍙嶄笉闂儊锛�
+     */
+    @ApiModelProperty(value = "鏍囪瘑闂儊")
+    private Integer blinkingFlag;
+
+    @ApiModelProperty(value = "涓�绾у搷搴斾汉openId")
+    private String responderOpenId;
+
+    @ApiModelProperty(value = "浜岀骇鍝嶅簲浜簅penId")
+    private String secondResponderOpenId;
+
+    @ApiModelProperty(value = "涓夌骇鍝嶅簲浜簅penId")
+    private String thirdResponderOpenId;
+
+
+
+    @ApiModelProperty(value = "涓夌骇鍝嶅簲浜�")
+    private String thirdResponder;
+
+
+
+    @ApiModelProperty(value = "宸ュ崟ID")
+    private String orderIds;
+
+    @ApiModelProperty(value = "宸ュ崟鐘舵��")
+    private String orderStatus;
+
+    @ApiModelProperty(value = "瀹夌伅鍙戣捣浜�")
+    private String operator;
+
+}

--
Gitblit v1.9.3