diff --git a/.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml b/.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml
deleted file mode 100644
index 212365c71..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml b/.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml
deleted file mode 100644
index 2774482d9..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml b/.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml
deleted file mode 100644
index 59dd7d979..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml b/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml
deleted file mode 100644
index a93d05779..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 7e5cfe959..448f8c761 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -239,6 +239,7 @@ public class EmisBaseService {
// 创建地址
emisCustomerAddressNew.setId(null);
emisCustomerAddressNew.setCustomerCode(emisCustomerUser.getCustomerCode());
+ emisCustomerAddressNew.preInsert();
emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddressNew);
return emisCustomerAddressNew;
@@ -264,6 +265,7 @@ public class EmisBaseService {
EmisCustomerUser emisCustomerUser=createCustomerUser(newEmisCustomerUser);
customerCode = emisCustomerUser.getCustomerCode();
addresItem.setCustomerCode(customerCode);
+ emisCustomerAddressNew.preUpdate();
emisCustomerAddressMapper.updateEmisCustomerAddress(addresItem);
}else{
customerCode=addresItem.getCustomerCode();
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index e9e162763..4b7ee7ba9 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -173,7 +173,6 @@
update emis_customer_address
- user_id = #{userId},
customer_code = #{customerCode},
short_name = #{shortName},
alias = #{alias},
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 06c2cc343..9a5cdc39a 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -310,7 +310,6 @@
openid = #{openid},
monthly_pay_code = #{monthlyPayCode},
user_name = #{userName},
- password = #{password},
owner_site = #{ownerSite},
country = #{country},
province = #{province},
diff --git a/emis-wms-web/emis-wms-web.iml b/emis-wms-web/emis-wms-web.iml
index bf316ad6c..f88ab46e0 100644
--- a/emis-wms-web/emis-wms-web.iml
+++ b/emis-wms-web/emis-wms-web.iml
@@ -19,8 +19,8 @@
-
-
+
+
@@ -77,8 +77,8 @@
-
-
+
+