From fe61e570f84d79026afe45a35ac816874b6e9846 Mon Sep 17 00:00:00 2001
From: river <1376754470@qq.com>
Date: Tue, 5 Jan 2021 18:01:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=87=8D=E7=BD=AE=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/crms/model/request/CompanyCustomerRequest.java    | 1 -
 .../daqing/financial/hrms/service/impl/EmployeeServiceImpl.java | 2 +-
 .../daqing/framework/domain/crms/ext/CustomerPersonalTOI.java   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java
index a321465e..a276f795 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java
@@ -32,7 +32,6 @@ public class CompanyCustomerRequest implements Serializable {
     @ApiModelProperty(value = "客户类型")
     private Integer type;
 
-    @NotNull(message = "客户经理人不能为空")
     @ApiModelProperty(value = "客户经理人ids")
     private Long manager;
 
diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
index 1dbe44db..db43f33a 100644
--- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
+++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
@@ -188,7 +188,7 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
             ExceptionCast.cast(HrmsCode.EMPLOYEE_IS_NULL);
         }
         String password = Md5Util.md5(PromptSuccess.RESET_PASSWORD + userId);
-        return this.getBaseMapper().updatePassword(id, password);
+        return this.getBaseMapper().updatePassword(userId, password);
     }
 
     /**
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java
index 5796f32e..71af9f34 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java
@@ -30,7 +30,6 @@ public class CustomerPersonalTOI implements Serializable {
     /**
      * 客户的经理人id
      */
-    @NotNull(message = "客户经理人不能为空")
     @ApiModelProperty(value = "客户经理人id")
     private Long manager;
     /**