From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期五, 17 五月 2024 11:40:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 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 3a2f572..1dcbd36 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 @@ -35,17 +35,15 @@ @ApiModelProperty(value = "鑺傜偣绫诲瀷") private String productType; - @ApiModelProperty(value = "榛樿鍥剧墖") - private String defaultImg; + @TableField(exist = false) + private String nodeType; - @ApiModelProperty(value = "杩愯鐘舵�佸浘鐗�") - private String operationalStatus; + @ApiModelProperty(value = "杩愯鍥剧墖") + private Long operatImg; - @ApiModelProperty(value = "寰呮満鐘舵�佸浘鐗�") - private String standbyState; - - @ApiModelProperty(value = "鏁呴殰鐘舵�佸浘鐗�") - private String faultState; + @TableField(exist = false) + @ApiModelProperty(value = "鍥剧墖鍚嶇О") + private String operatImgName; @ApiModelProperty(value = "鎺掑簭") private Integer sort; -- Gitblit v1.9.1