Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-11 3594a911312b92561b08c478ef0319cf1ae2b0d8

 inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java

@@ -21,5 +21,5 @@
    IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime);

    //查询订单bom列表
    IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state, String time);
    IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer type, String time);
}