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

Administrator

8 天以前 f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce

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

@@ -16,6 +16,10 @@

    private String orderType; // 订单类型

    private String customerName; // 客户名称

    private String memo; // 订单备注

    List<String> groups; // 包装组号列表

//    private List<Rolls> matDetails;