Merge branch 'dev' into test

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

@@ -45,5 +45,5 @@ public class MesNumberSerialno extends BaseBean implements Serializable {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public Integer lockVersion;
+    public transient Integer lockVersion;
 }

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

@@ -46,6 +46,11 @@ public class MesSyncDeadLetter extends BaseBean implements Serializable {
     private String pcnCode;
 
     @Lob
+    @Column(name = "EX_MSG")
+    @ApiParam("同步数据")
+    private String exMsg;
+
+    @Lob
     @Column(name = "DATA")
     @ApiParam("同步数据")
     private String data;