[解决冲突1]

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

@@ -128,4 +128,8 @@ public class MesPlc extends BaseBean implements Serializable {
     @Transient
     @ApiParam("OPC值")
     private String opcValue;
+
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode;
 }