Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.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;
 
 /**
@@ -62,4 +63,8 @@ public class MesBlindRule extends BaseBean implements Serializable {
     @ApiParam("零件颜色")
     private String partColor;
 
+    @Transient
+    @ApiParam("零件颜色")
+    private String rightKey;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java

@@ -36,4 +36,7 @@ public class MesBlindProbleModel extends BaseBean {
     @ApiParam(value = "工厂代码")
     private String organizeCode;
 
+    @ApiParam("序号")
+    private String topicId;
+
 }