Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="IS_VALID")
     @ApiParam(value = "有效性",example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED")

modules/i3plus-pojo-model/pom.xml

@@ -36,6 +36,11 @@
 
         <dependency>
             <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-andon</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-wms</artifactId>
         </dependency>
         <dependency>

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.model.andon;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: mes定时获取安灯安灯任务信息请求DTO
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-10-25-14:40
+ * @Modify:
+ **/
+@Data
+public class AndonManageQueueSyncModel{
+
+    @ApiParam("同步时间")
+    private String syscTime;
+
+    @ApiParam("安灯状态")
+    private List<Object> statusList;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -137,7 +137,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
     /**
      * 调用脚本方法保存数据
      */
-        @Column(name = "USE_SCRIPT_PUSH")
+    @Column(name = "USE_SCRIPT_PUSH")
     public Integer useScriptPush;
 
     /**