Jenkins自动合并

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

@@ -1077,7 +1077,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CARRIAGE_STATUS {
         CREATE(10, "创建"),
-        PUBLISH(20, "发布"),
+        PUBLISH(20, "已发布"),
         RECEIVE(30, "承运商接收"),
         ARRIVE(40, "车辆到达"),
         INSTALL(50, "装车完成"),

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -36,4 +36,7 @@ public class WmsStockFifoModel {
 
     @ApiParam(value = "波次配料物料清单")
     boolean collectPicking = false;
+
+    @ApiParam("默认规则")
+    private String defaultRule;
 }