【合并冲突】

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable {
     @Column(name = "PROCESS_LABEL_TEMPLATE")
     @ApiParam("过程标签模板")
     private String processLabelTemplate;
+
+    @Transient
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Transient
+    @ApiParam("Vin")
+    private String vinCode;
 }