Merge branch 'master' of hyq/ccnet-wx-mp3.0 into master

src/main/java/com/emato/ccnet/wx/service/impl/CusWaybillServiceImpl.java

@@ -289,6 +289,7 @@ public class CusWaybillServiceImpl implements CusWaybillService {
             } else {
                 cusWaybill.setExprCompId("emato");
             }
+            cusWaybill.setExprAgreementType(wxOrder.getExprAgreementType());
             // 发送ws路径标识
             cusWaybill.setWsFlag(wxOrder.getWsFlag());
             // 地址

src/main/resources/mybatis/mapper/ccnet/biz/CusWaybilBizlMapper.xml

@@ -58,6 +58,7 @@
         pay_time,
         expr_type,
         expr_comp_id,
+        expr_agreement_type,
         decl_expr_fee,
         decl_post_tax,
         shop_id,
@@ -119,6 +120,7 @@
           #{item.payTime,jdbcType=TIMESTAMP},
           #{item.exprType,jdbcType=CHAR},
           #{item.exprCompId,jdbcType=VARCHAR},
+          #{item.exprAgreementType,jdbcType=VARCHAR},
           #{item.declExprFee,jdbcType=DECIMAL},
           #{item.declPostTax,jdbcType=DECIMAL},
           #{item.shopId,jdbcType=VARCHAR},
@@ -258,6 +260,9 @@
                 <if test="item.exprCompId != null" >
                     expr_comp_id = #{item.exprCompId,jdbcType=VARCHAR},
                 </if>
+                <if test="item.exprAgreementType != null" >
+                    expr_agreement_type = #{item.exprAgreementType,jdbcType=VARCHAR},
+                </if>
                 <if test="item.declExprFee != null" >
                     decl_expr_fee = #{item.declExprFee,jdbcType=DECIMAL},
                 </if>