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

野心家

2023-10-10 f9fca9fa8b2a1d7d9abe18b10717cf62c5c8bcaf

 src/main/java/com/zy/common/model/OrderMergeVo.java

@@ -22,6 +22,12 @@

    private Double anfme;

    //销售订单号
    private String csocode;

    //销售订单行号
    private String isoseq;

    private List<OrderDto> orderDtos = new ArrayList<>();

    public OrderMergeVo(String matnr, String batch, Double anfme) {