修改邮箱关键字

Signed-off-by: Hongjiang <hongjiang.quan@topsunit.com>

topsun-xt/src/main/webapp/biz/topsun/customer/customerDetail.js

@@ -70,7 +70,7 @@ function loadContactListGrid() {
                 }
             },
             {
-                display: "邮箱", name: "contactMail", width: 300, minWidth: 60, type: "string", align: "left",
+                display: "邮箱", name: "contactEmail", width: 300, minWidth: 60, type: "string", align: "left",
                 editor: {
                     required: true, type: "text"
                 }

topsun/src/main/java/com/huigou/topsun/customer/domain/CustomerContact.java

@@ -50,8 +50,8 @@ public class CustomerContact implements Serializable {
     /**
      * 邮件
      */
-    @Column(name = "contact_mail")
-    private String contactMail;
+    @Column(name = "contact_email")
+    private String contactEmail;
 
 
     private static final long serialVersionUID = 1L;

topsun/src/main/java/com/huigou/topsun/customer/domain/query/ContactQueryRequest.java

@@ -35,7 +35,7 @@ public class ContactQueryRequest extends QueryAbstractRequest {
     /**
      * 邮件
      */
-    private String contactMail;
+    private String contactEmail;
 
     public String getCustomerContactId() {
         return customerContactId;
@@ -77,11 +77,11 @@ public class ContactQueryRequest extends QueryAbstractRequest {
         this.contactFax = contactFax;
     }
 
-    public String getContactMail() {
-        return contactMail;
+    public String getContactEmail() {
+        return contactEmail;
     }
 
-    public void setContactMail(String contactMail) {
-        this.contactMail = contactMail;
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
     }
 }

topsun/src/main/resources/config/topsun/customer/customerMapper.xml

@@ -18,9 +18,9 @@
 
     <query name="getCustomerList" label="对外查询客户信息" table="customer">
         <sql-query>
-            SELECT customer.customer_id,customer.customer_name,customer.province_code,co.quotation_currency,co.monthly_settlement_method,co.order_kind,ccc.contact_name,ccc.contact_phone,ccc.contact_fax,ccc.contact_mail,co.remark
+            SELECT customer.customer_id,customer.customer_name,customer.province_code,co.quotation_currency,co.monthly_settlement_method,co.order_kind,ccc.contact_name,ccc.contact_phone,ccc.contact_fax,ccc.contact_email,co.remark
             FROM customer LEFT JOIN
-            (SELECT c.customer_id,cc.contact_name,cc.contact_phone,cc.contact_fax,cc.contact_mail FROM customer c LEFT JOIN customer_contact cc ON c.customer_id = cc.customer_id) AS ccc
+            (SELECT c.customer_id,cc.contact_name,cc.contact_phone,cc.contact_fax,cc.contact_email FROM customer c LEFT JOIN customer_contact cc ON c.customer_id = cc.customer_id) AS ccc
             ON customer.customer_id = ccc.customer_id LEFT JOIN customer_order co
             ON customer.customer_id = co.customer_id
         </sql-query>