Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

19 小时以前 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java

@@ -12,6 +12,7 @@

    private Long orderItemId;//订单明细ID
    private Long waveId = 16L;//出库策略
    private List<Detl> detlList;
    class Detl{
        private String loc_no;
        private String matnr;