Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -12,8 +12,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
-
-
     /**
      * MesIf  交互方式
      */

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

@@ -104,6 +104,10 @@ public class MesPackage extends BaseBean {
     private String custCodeName;
 
     @Transient
+    @ApiParam("打印缓存id")
+    private String printId;
+
+    @Transient
     @ApiParam("包装层级名称")
     private String packLevelName;