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

Junjie

3 天以前 85348794065f9fe83896733360f289879a035376

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

 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java

@@ -538,8 +538,8 @@
                iaIjBillB.setCstateid(orderDetl.getCstateidVcode());

                hid = nccSaleDbddWms.getCbillid();
                bids.add(iaIjBillB);
            }
            bids.add(iaIjBillB);
        }
        data.put("hid", hid);
        data.put("bids", bids);