From 8261ceda58718fe8becb795d09e152a3b61a6f22 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 16:39:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/vo/GdImplementationListVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
similarity index 75%
rename from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/vo/GdImplementationListVO.java
rename to drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
index 7b02291..3b6c813 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/vo/GdImplementationListVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
@@ -14,23 +14,22 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.sxkj.gd.implementation.vo;
+package org.sxkj.gd.implement.vo;
-import java.io.Serializable;
-import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
+import org.sxkj.gd.implement.entity.GdThingListMaterialRelEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
- * 实施清单表（实时清单管理） 视图实体类
+ * 实施清单-材料关联表（情形化配置） 视图实体类
*
- * @author lw
- * @since 2026-01-14
+ * @author Aix
+ * @since 2026-01-31
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class GdImplementationListVO extends GdImplementationListEntity implements Serializable {
+public class GdThingListMaterialRelVO extends GdThingListMaterialRelEntity {
private static final long serialVersionUID = 1L;
}
--
Gitblit v1.9.3