Merge branch 'dev_20260429' into dev_WMS20260401

# Conflicts: # mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java # mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
2026-05-21 16:14:56 +08:00
parent e782cd05d1 57d5043ac2
commit dc26614e68
41 changed files with 577 additions and 64 deletions
@@ -259,4 +259,7 @@ public class UserDTO extends BaseVOEntity {

    @ApiModelProperty("配送顺序")
    private String deliveryOrder;
-}
+
+    @ApiModelProperty("yms密码")
+    private String plainPassword;
+}