Merge remote-tracking branch 'origin/master'

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java

@@ -372,7 +372,6 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
         user.setAccount(employeeInfoVO.getAccount());
         user.setCreateTime(new Date());
         user.setMotifyTime(new Date());
-        user.setPhoneAccount(employeeInfoVO.getPhone());
         Boolean result1 = this.getBaseMapper().insertUser(user);
         EmployeeEntity employee = new EmployeeEntity();
         if (result1) {

dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml

@@ -495,7 +495,7 @@
 
     <insert id="insertUser" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.daqing.framework.domain.hrms.UserEntity">
-        INSERT INTO hrms_user (account,phone_account,create_time,motify_time) VALUES (#{account},#{phoneAccount},#{createTime},#{motifyTime})
+        INSERT INTO hrms_user (account,create_time,motify_time) VALUES (#{account},#{createTime},#{motifyTime})
     </insert>
 
     <select id="getEmployeeByUserId" parameterType="long" resultMap="employeeInfoByUserId">