Merge remote-tracking branch 'origin/master'

lyh

2 天以前 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderService.java

@@ -40,4 +40,6 @@
   List<String> convertToOutboundOrder(List<String> preparationOrderIds);

   IPage<PreparationOrder> queryPageList(Page<PreparationOrder> page, Map<String, String[]> parameterMap);

   void addPreparationOrderFromDnc(PreparationOrderAndDetailDto preparationOrderAndDetailDto);
}