From a7ad8c17aa069e723aa0a813cf198d07e67b5fb5 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 14 三月 2025 14:19:08 +0800 Subject: [PATCH] 新增刀具、设备类信息管理,新增结构树优化,优化权限分配,新增双控设备结构书 修改flow模块 删除部分废弃yml配置 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java index c4a05b1..d7c1d1a 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java @@ -22,7 +22,7 @@ @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel(value = "璁惧鏍戠粨鏋勬暟鎹疄浣�", description = "璁惧") -public class MdcEquipmentTree implements Serializable { +public class MdcEquipmentTree<T> implements Serializable { private static final long serialVersionUID = -5202127219834067917L; @@ -60,6 +60,24 @@ * 鐖剁骇id锛堝墠绔姹傜敤锛� */ private String parentId; + + /** + * 杞﹂棿鎻忚堪 + */ + private String memo; + + private T entity; + + /** + * 绫诲瀷 1 杞﹂棿 2璁惧 + */ + private Integer type; + + /** + * orgType + */ + private String orgType; + private List<MdcEquipmentTree> children = new ArrayList<>(); @@ -99,6 +117,9 @@ this.key = treeModel.getId(); this.value = treeModel.getId(); this.title = treeModel.getProductionName(); + this.memo = treeModel.getMemo(); + this.type = treeModel.getType(); + this.orgType = treeModel.getOrgType(); return this; } -- Gitblit v1.9.3