Merge branch 'dev_20260429' into dev_WMS20260401

# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java # mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
2026-05-26 08:38:02 +08:00
parent 4b22e56b54 735f7f9113
commit 9a6e544d56
2 changed files with 3 additions and 6 deletions
@@ -2123,6 +2123,7 @@ public class UserApplicationService {

        BeanUtils.copyProperties(userPo, userEntity);

+
        return userPo;
    }