Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -185,6 +185,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码打印状态名称")
     private String printStatusName;
 
+    @Transient
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Transient
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Transient
+    @ApiParam("电检结果")
+    private String electricResult;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java

@@ -22,7 +22,10 @@ import javax.persistence.*;
 @DynamicUpdate
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
+@Table(name = "SCRIPT_PERSISTENCE", indexes = {
+        @Index(columnList = "SCRIPT_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
     private static final long serialVersionUID = 7893111140559759490L;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -64,6 +64,10 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板参数拼接")
     private String paramsPack;
 
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
     @Transient
     @ApiParam(value ="模板id对应的模板参数")
     private List<SysLabelTemplateParam> labelTemplateParamList;