Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-10-25 b573243ff526f948a499c8557b49ee97e94f035d

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java

@@ -33,9 +33,9 @@
                                                         @Param("productId") Integer productId,@Param("orderId") String orderId);

    Map<String, Object> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") String value);
                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") Double value);

    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") String value);
    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);

    List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);