diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java index 45a6c09fd..30ce5ba71 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java @@ -57,6 +57,8 @@ public class EmisCustomerUser extends BaseEntity private String userType; /* 所属公司 */ private String company; + /* 营业执照号,纳税人识别号 */ + private String licNo; /* 部门id */ private String deptId; /* 头像url地址 */ @@ -102,24 +104,8 @@ public class EmisCustomerUser extends BaseEntity private String address; /* email */ private String email; - /* 寄件国 */ - private String sendCountry; - /* 寄件省 */ - private String sendProvince; - /* 寄件区 */ - private String sendCity; - /* 寄件区 */ - private String sendCounty; - /* 寄件镇 */ - private String sendTown; - /* 寄件人 */ - private String sendPerson; - /* 寄件电话 */ - private String sendPhone; /* 邮编 */ private String postCode; - /* 启用状态 1-启用 0-未启用 */ - private String status; /* 真实姓名 */ private String realName; /* 身份证号 */ @@ -136,10 +122,12 @@ public class EmisCustomerUser extends BaseEntity private String blSms; /* 专属业务员 */ private String opEmpCode; - /* 排序 */ - private String orderNum; /* 首次签约 */ private String firstSigningDay; + /* 启用状态 1-启用 0-未启用 */ + private String status; + /* 排序 */ + private String orderNum; //--------- diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index 581b12788..4efc1deb9 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -4,7 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -18,6 +17,7 @@ + @@ -40,15 +40,7 @@ - - - - - - - - @@ -57,8 +49,9 @@ - + + @@ -100,7 +93,7 @@ - select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, send_country, send_province, send_city, send_county, send_town, send_person, send_phone, post_code, status, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, order_num, first_signing_day, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user + select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user @@ -193,6 +186,7 @@ settled_type, user_type, company, + lic_no, dept_id, avatar, sex, @@ -215,15 +209,7 @@ town, address, email, - send_country, - send_province, - send_city, - send_county, - send_town, - send_person, - send_phone, post_code, - status, real_name, id_no, payee, @@ -232,8 +218,9 @@ bl_open_oms, bl_sms, op_emp_code, - order_num, first_signing_day, + status, + order_num, remark, del_flag, create_by, @@ -256,6 +243,7 @@ #{settledType}, #{userType}, #{company}, + #{licNo}, #{deptId}, #{avatar}, #{sex}, @@ -278,15 +266,7 @@ #{town}, #{address}, #{email}, - #{sendCountry}, - #{sendProvince}, - #{sendCity}, - #{sendCounty}, - #{sendTown}, - #{sendPerson}, - #{sendPhone}, #{postCode}, - #{status}, #{realName}, #{idNo}, #{payee}, @@ -295,8 +275,9 @@ #{blOpenOms}, #{blSms}, #{opEmpCode}, - #{orderNum}, #{firstSigningDay}, + #{status}, + #{orderNum}, #{remark}, #{delFlag}, #{createBy}, @@ -322,6 +303,7 @@ settled_type = #{settledType}, user_type = #{userType}, company = #{company}, + lic_no = #{licNo}, dept_id = #{deptId}, avatar = #{avatar}, sex = #{sex}, @@ -344,15 +326,7 @@ town = #{town}, address = #{address}, email = #{email}, - send_country = #{sendCountry}, - send_province = #{sendProvince}, - send_city = #{sendCity}, - send_county = #{sendCounty}, - send_town = #{sendTown}, - send_person = #{sendPerson}, - send_phone = #{sendPhone}, post_code = #{postCode}, - status = #{status}, real_name = #{realName}, id_no = #{idNo}, payee = #{payee}, @@ -361,8 +335,9 @@ bl_open_oms = #{blOpenOms}, bl_sms = #{blSms}, op_emp_code = #{opEmpCode}, - order_num = #{orderNum}, first_signing_day = #{firstSigningDay}, + status = #{status}, + order_num = #{orderNum}, remark = #{remark}, del_flag = #{delFlag}, create_by = #{createBy},