diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html
index c0120174..f23c981d 100644
--- a/ghy-admin/src/main/resources/templates/order/orderManager.html
+++ b/ghy-admin/src/main/resources/templates/order/orderManager.html
@@ -613,6 +613,7 @@
             sortName: "createTime",
             sortOrder: "desc",
             modalName: "订单",
+            uniqueId: 'id',
             columns: [
                 {
                     checkbox: true
@@ -976,7 +977,7 @@
     function mergePay() {
         table.set();
         var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-        if (rows.length === 0) {
+        if (rows.length == 0) {
             $.modal.alertWarning("请至少选择一条记录");
             return;
         }
diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html
index c793998e..a9dd1714 100644
--- a/ghy-admin/src/main/resources/templates/order/pc-master.html
+++ b/ghy-admin/src/main/resources/templates/order/pc-master.html
@@ -393,6 +393,7 @@
     function initOrderList() {
         var options = {
             url: prefix + "/list",
+            uniqueId: 'id',
             exportUrl: prefix + "/export",
             queryParams: queryParams,
             sortName: "createTime",
diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml
index bf28392c..7c7284cf 100644
--- a/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml
+++ b/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml
@@ -29,7 +29,7 @@
     <select id="getCustomerAddressList" resultMap="CustomerAddressResult">
         <include refid="selectCustomerAddress" />
         <where>
-            deleted = 0
+
             <if test="customerId != null">
                 AND customer_id = #{customerId}
             </if>