diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index afd07f546..f7927a737 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit afd07f546d032e9cc6889df29d315af6d32c0f4c
+Subproject commit f7927a737df5dd196f3c8fb7bb5e9cf5b785655f
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
index 6aa086526..3f3076efd 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
@@ -214,6 +214,11 @@ public class ApiAppUserController {
         return appUserService.updatePassword(userDTO);
     }
 
+    @PostMapping("user/forgotPwd")
+    public Result forgotPwd(@RequestBody UserDTO userDTO){
+        return appUserService.forgotPwd(userDTO);
+    }
+
     @PostMapping("user/updateAvatar")
     public Result updateAvatar(@LoginUser TokenDto userDetail, EpdcUserUpdateAvatarFromDTO fromDTO) {
         ValidatorUtils.validateEntity(fromDTO);
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index edf3b2858..d34f62053 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -559,4 +559,7 @@ public interface UserFeignClient {
 
     @PostMapping("app-user/epdc-app/user/updatePassword")
     Result updatePassword(UserDTO userDTO);
+
+    @PostMapping("app-user/epdc-app/user/forgotPwd")
+    Result forgotPwd(UserDTO userDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
index d4e01125e..dc9839ec2 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
@@ -312,4 +312,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result updatePassword(UserDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updatePassword", userDTO);
     }
+
+    @Override
+    public Result forgotPwd(UserDTO userDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "forgotPwd", userDTO);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
index 0136181c3..d0e8da49d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
@@ -418,4 +418,11 @@ public interface AppUserService {
      * @return
      */
     Result updatePassword(UserDTO userDTO);
+
+    /**
+     * 忘记密码
+     * @param userDTO
+     * @return
+     */
+    Result forgotPwd(UserDTO userDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 83d401490..9673468e5 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -1690,6 +1690,11 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.updatePassword(userDTO);
     }
 
+    @Override
+    public Result forgotPwd(UserDTO userDTO) {
+        return userFeignClient.forgotPwd(userDTO);
+    }
+
     @Override
     public Result saveRedspearhead(RedSpearheadDTO dto) {
         return userFeignClient.saveRedspearhead(dto);
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
index c29769e32..2ce3b9ab3 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
@@ -544,4 +544,9 @@ public class EpdcAppUserController {
     public Result updatePassword(@RequestBody UserDTO userDTO){
         return djylService.updatePassword(userDTO);
     }
+
+    @PostMapping("forgotPwd")
+    public Result forgotPwd(@RequestBody UserDTO userDTO){
+        return djylService.forgotPwd(userDTO);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDjylDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDjylDao.java
index d4c1ee1ff..b403dfce6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDjylDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDjylDao.java
@@ -35,4 +35,5 @@ public interface UserDjylDao extends BaseDao<UserDjylEntity> {
      */
     EpdcUserInfoResultDTO selectOneInfoById(String id);
 
+    List<UserDTO> selectByMobileAndIdentityNo(@Param("mobile") String mobile, @Param("identityNo") String identityNo);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserDjylService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserDjylService.java
index 780c9caad..49e77f66e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserDjylService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserDjylService.java
@@ -65,4 +65,6 @@ public interface UserDjylService extends BaseService<UserDjylEntity> {
     Result mpmVerifyRegisterData(EpdcUserRegistFormDTO formDto);
 
     Result updatePassword(UserDTO userDTO);
+
+    Result forgotPwd(UserDTO userDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java
index 9a6039218..bac46ff32 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.user.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -283,7 +284,7 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
             if (null != entity) {
                 if (!PasswordUtils.matches(userDTO.getOldPassword(), entity.getPassword())) {
                     return new Result<>().error(-1, "请确认旧密码是否正确！");
-                }else {
+                } else {
                     entity.setPassword(PasswordUtils.encode(userDTO.getNewPassword()));
                     baseDao.updateById(entity);
                     return new Result().ok("密码修改成功！");
@@ -295,6 +296,24 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
             return new Result().error(-1, "请确认参数是否正确，或重新登陆后修改");
     }
 
+    @Override
+    public Result forgotPwd(UserDTO userDTO) {
+        if (StringUtils.isNotEmpty(userDTO.getIdentityNo()) && StringUtils.isNotEmpty(userDTO.getMobile())) {
+            List<UserDTO> dtoList = baseDao.selectByMobileAndIdentityNo(userDTO.getMobile(), userDTO.getIdentityNo());
+            UserDjylEntity entity = null;
+            if (CollectionUtil.isNotEmpty(dtoList)) {
+                entity = ConvertUtils.sourceToTarget(dtoList.get(0), UserDjylEntity.class);
+            }
+            if (null != entity) {
+                entity.setPassword(PasswordUtils.encode(userDTO.getNewPassword()));
+                baseDao.updateById(entity);
+            } else {
+                return new Result().error(-1, "请确认是否注册过该账号，或联系管理员！");
+            }
+        }
+        return new Result().ok("密码已修改，请重新登陆！");
+    }
+
     /**
      * 用户网格关系表，更新最后访问网格的时间
      *
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDjlyDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDjlyDao.xml
index 1f183c380..b969ad34d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDjlyDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDjlyDao.xml
@@ -96,4 +96,17 @@
         WHERE eu.ID = #{id}
     </select>
 
+    <select id="selectByMobileAndIdentityNo" resultType="com.elink.esua.epdc.user.dto.UserDTO">
+        SELECT eu.ID ,eu.PASSWORD FROM epdc_user_djyl eu
+        <where>
+            eu.DEL_FLAG = 0
+            <if test="mobile != ''">
+                and eu.MOBILE = #{mobile}
+            </if>
+            <if test="identityNo != ''">
+                and eu.IDENTITY_NO = #{identityNo}
+            </if>
+        </where>
+    </select>
+
 </mapper>