合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/java/com/zy/asrs/entity/param/StockOutParam.java

@@ -42,6 +42,9 @@

        //销售订单行号
        private String deadTime;

        // 工序状态 1：待加工，2：已加工，3：无需加工
        private Integer processSts;
    }

}