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

Junjie

7 天以前 85348794065f9fe83896733360f289879a035376

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

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

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