Jenkins自动合并

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

@@ -981,7 +981,6 @@ public class WmsEnumUtil {
 
     /**
      * 业务表：库存条码状态
-     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -991,7 +990,6 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        //SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;

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

@@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean {
 
     @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
     @ApiParam(value = "是否自动开窗")
+    @AnnoOutputColumn
     private Integer isAutoOpenWindow;
 
     @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")