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

trade-common/src/main/java/com/hchbox/constant/SqlConstants.java

@@ -16,7 +16,7 @@ public class SqlConstants {
             "created,credit_card_fee, end_time, express_agency_fee, has_buyer_message, has_post_fee,has_yfx, is_brand_sale, is_force_wlb, modified, num, num_iid, pay_time,payment, " +
             "point_fee, post_fee, price, real_point_fee, received_payment, receiver_address,receiver_city, receiver_district, receiver_mobile, receiver_name, receiver_phone,receiver_state, " +
             "receiver_zip, seller_alipay_no, seller_cod_fee, seller_email, seller_flag,seller_mobile, seller_name, seller_nick, seller_phone, seller_rate, send_time, shipping_type,status, step_paid_fee," +
-            "step_trade_status,tid, timeout_action_time, title, total_fee,trade_from, trade_source, type, yfx_fee, yfx_id, yfx_type  from ";
+            "step_trade_status,tid, timeout_action_time, title, total_fee,trade_from, trade_source, type, yfx_fee, yfx_id, yfx_type,oaid  from ";