Merge branch 'dev' into dev_WMS20260401

# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
#	mhd_oms/src/main/resources/bootstrap.yml
#	mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/ContractManagePO.java

@@ -54,8 +54,8 @@ public class ContractManagePO extends BaseVOEntity{
     @Excel(name = "是否通用合同", readConverterExp = "1=-是，2-否")
     private Integer commonContractFlag;
 
-    @ApiModelProperty("合同类型（1-仓储，2-运输）")
-    @Excel(name = "合同类型", readConverterExp = "1=-仓储，2-运输")
+    @ApiModelProperty("合同类型（1-仓储，2-运输，3-其他）")
+    @Excel(name = "合同类型", readConverterExp = "1=-仓储，2-运输，3=-其他")
     private Integer contractType;
 
     @ApiModelProperty("合同状态（1-未生效，2-使用中，3-已过期，4-已作废）")