Merge branch 'dev' into dev_WMS20260401

# Conflicts: # mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
2026-04-28 13:41:57 +08:00
parent 5f56c21b84 99f086fdfa
commit 269fef04b2
20 changed files with 249 additions and 22 deletions
@@ -208,6 +208,8 @@ public class UserDriverDTO extends UserDTO {
    private String driverAuthByUsername;
    @ApiModelProperty(name = "司机用户姓名")
    private String userName;
+    @ApiModelProperty(name = "司机手机号")
+    private String userPhone;

    @ApiModelProperty(name = "司机审核时间")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")