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

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/resevationOrder/OmsCargoInfoDTO.java

@@ -62,6 +62,9 @@ public class OmsCargoInfoDTO implements Serializable {
     @ApiModelProperty("体积")
     private BigDecimal materialVolume;
 
+    @ApiModelProperty("货物体积")
+    private BigDecimal cargoVolume;
+
     @ApiModelProperty("内容")
     private String cargoContent;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/resevationOrder/OmsOrderAddDTO.java

@@ -480,6 +480,9 @@ public class OmsOrderAddDTO implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private java.util.Date documentDate;
 
+    @ApiModelProperty(value = "预约单类型")
+    private Integer orderType;
+
 
     @ApiModelProperty("费用科目明细")
     private List<OmsOrderAccount> tmsOrderAccountList;

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/resevationOrder/ResevationOrderApi.java

@@ -236,7 +236,12 @@ public class ResevationOrderApi extends BaseController{
 
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("取消预约失败：" + e.getMessage());
+            String errorMsg = e.getMessage();
+            // 移除错误消息中的换行符及后面的无用信息
+            if (errorMsg != null && errorMsg.contains("\n[ErrorCode]:")) {
+                errorMsg = errorMsg.substring(0, errorMsg.indexOf("\n[ErrorCode]:"));
+            }
+            return Result.error("取消预约失败:" + errorMsg);
         }
     }