From 33246bb56e05b273944ec1cc03a58dc112e48848 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 16 八月 2024 09:42:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java
index 5214b23..a449a80 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java
@@ -30,11 +30,11 @@
 	@TableField(exist = false)
 	private String nodeTypeExt;
 
-	@TableField(exist = false)
+/*	@TableField(exist = false)
 	private int imgWidth;
 
 	@TableField(exist = false)
-	private int imgHeight;
+	private int imgHeight;*/
 	@TableField(exist = false)
 	private String dataId;
 	@TableField(exist = false)
@@ -43,22 +43,34 @@
 	private String productType;
 
 	@TableField(exist = false)
-	private Integer reliabDistribType;
+	private int reliabDistribType;
 	@TableField(exist = false)
 	private String taskMtbcf;
 	@TableField(exist = false)
-	private String taskMtbcfOther;
+	private String taskMtbcfOtherParams2;
+	@TableField(exist = false)
+	private String taskMtbcfOtherParams3;
 
 	@TableField(exist = false)
 	private String svgContent;
 
 	@TableField(exist = false)
+	@ApiModelProperty(value = "閿氱偣x6鐨刋ML")
+	private String anchorsContent;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "閿氱偣鍧愭爣")
+	private String anchorsPoints;
+
+	@TableField(exist = false)
 	private Integer isRepair;
 	@TableField(exist = false)
-	private Integer repairDistribType;
+	private int repairDistribType;
 	@TableField(exist = false)
 	private String RepairMttcr;
 	@TableField(exist = false)
-	private String RepairMttcrOther;
+	private String RepairMttcrOtherParams2;
+	@TableField(exist = false)
+	private String RepairMttcrOtherParams3;
 
 }

--
Gitblit v1.9.1