Jenkins自动合并

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

@@ -286,7 +286,8 @@ public class BlockReportEnumUtil {
         ECHARTS_PIE(10, "饼图", "实芯饼图"),
         ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"),
         ECHARTS_LINE(30, "折线图", "向右折线条图"),
-        ECHARTS_TREEMAP(40, "矩形图", "矩形图");
+        ECHARTS_TREEMAP(40, "矩形图", "矩形图"),
+        SELECT_SINGLE(50, "下拉单选", "下拉单选");
 
         private int value;
         private String name;

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

@@ -2107,7 +2107,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMMON_SN {
         PO_SN("PO_SN", "PO条码"),
-        VDA_SN("VDA_SN", "VDA条码");
+        VDA_SN("VDA_SN", "VDA条码"),
+        SELF_SN("SELF_SN", "自制件条码");
 
         private String code;
         private String description;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : WMS搜索元素表
@@ -62,4 +59,14 @@ public class WmsSearchElement extends BaseBean {
     @Column(name = "USER_CODE")
     @ApiParam(value = "用户编号")
     private String userCode;
+
+    /**
+     * 搜索组名称
+     */
+    private String groupName;
+
+    /**
+     * 搜索组连接符
+     */
+    private String groupConnector;
 }