From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期五, 02 八月 2024 15:18:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TyProductModel.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TyProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TyProductModel.java index e3c2269..d832e3f 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TyProductModel.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TyProductModel.java @@ -44,14 +44,16 @@ @ApiModelProperty(value = "缁翠慨鍒嗗竷") private Integer repairDistrib; - @ApiModelProperty(value = "杩愯鐘舵�佸浘鐗嘔D") - private String operationalStatus; + @ApiModelProperty(value = "杩愯鍥剧墖ID") + private Long operatImg; - @ApiModelProperty(value = "寰呮満鐘舵�佸浘鐗嘔D") - private String standbyState; + @TableField(exist = false) + @ApiModelProperty(value = "鍥剧墖鍚嶇О") + private String operatImgName; - @ApiModelProperty(value = "鏁呴殰鐘舵�佸浘鐗嘔D") - private String faultState; + @TableField(exist = false) + @ApiModelProperty(value = "鍥剧墖鍚嶇О") + private String svgContent; @ApiModelProperty(value = "鎺掑簭") private Integer sort; -- Gitblit v1.9.1