From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期五, 02 八月 2024 10:04:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 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..bd48c30 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 @@ -27,6 +27,8 @@ @ApiModelProperty(value = "涓婄骇ID") private Long pid; + @ApiModelProperty(value = "鎬讳綋ID") + private Long shipId; @ApiModelProperty(value = "婧怚D") private Long srcId; @ApiModelProperty(value = "鍚嶇О") @@ -35,17 +37,17 @@ @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; + @TableField(exist = false) + @ApiModelProperty(value = "鍥剧墖鍚嶇О") + private String operatImgName; - @ApiModelProperty(value = "鏁呴殰鐘舵�佸浘鐗�") - private String faultState; + private String equipType; @ApiModelProperty(value = "鎺掑簭") private Integer sort; -- Gitblit v1.9.1