Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service

emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml

@@ -59,7 +59,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.total_volume,
                seaway1.site_name as departure_port_name,
                seaway2.site_name as destination_port_name,
-               b.*
+               b.sub_bill_no,
+               b.bill_code,
+               b.fee_code,
+               b.fee_name,
+               b.bill_fee,
+               b.orig_fee,
+               b.currency,
+               b.order_num
         from emis_waybill a
         left join emis_settle_sub_bill_feeitem b on a.bill_code = b.bill_code and b.del_flag = '0'
         left join emis_site seaway1 on a.departure_port=seaway1.site_code and seaway1.del_flag='0'