diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 891c0609f..014ea789b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -917,9 +917,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员");
         }
 
-
-
-
         return emisWaybillMapper.assignTakeMan(emisWaybill);
     }
 
@@ -946,8 +943,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消");
         }
 
-
-
         return emisWaybillMapper.assignSendSite(emisWaybill);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index 99d5ffa59..749f7dbf2 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -169,9 +169,9 @@
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="phone != null and phone != ''">phone = #{phone},</if>
             <if test="province != null and province != ''">province = #{province},</if>
-            <if test="city != null and city != ''">city = #{city},</if>
-            <if test="county != null and county != ''">county = #{county},</if>
-            <if test="town != null and town != ''">town = #{town},</if>
+            city = #{city},
+            county = #{county},
+            town = #{town},
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
             <if test="email != null and email != ''">email = #{email},</if>