From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期二, 22 十月 2024 14:43:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java index 2f9e5d9..9c37bbf 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java @@ -43,9 +43,16 @@ @ApiModelProperty(value = "杩愯鍥剧墖") private Long operatImg; + @ApiModelProperty(value = "鍚岀被璁惧鍚�") + private String sameSbName; + @TableField(exist = false) @ApiModelProperty(value = "鍥剧墖鍚嶇О") private String operatImgName; + + private String equipType; + + private String namePath; @ApiModelProperty(value = "鎺掑簭") private Integer sort; @@ -53,4 +60,7 @@ @ApiModelProperty(value = "瀛愯妭鐐�") @TableField(exist = false) private List<XhProductModel> children = new ArrayList<>(); + + @TableField(exist = false) + private Long paramId; } -- Gitblit v1.9.1