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-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java

@@ -56,8 +56,8 @@ public class ContractManage 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-已作废）")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java

@@ -57,8 +57,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-已作废）")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java

@@ -54,8 +54,8 @@ public class ContractManageDO 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-已作废）")

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java

@@ -74,5 +74,12 @@ public class MaterialClassify extends BaseVOEntity{
     @Excel(name = "是否作废: 1-否 2-是")
     private Integer nullify;
 
+    @ApiModelProperty("收费标准")
+    @Excel(name = "收费标准")
+    private String chargeStandard;
 
-}
+    @ApiModelProperty("单位")
+    @Excel(name = "单位")
+    private String unit;
+
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/po/MaterialClassifyPO.java

@@ -81,6 +81,12 @@ public class MaterialClassifyPO extends BaseVOEntity{
     @ApiModelProperty("上级分类字典编码集合")
     @Excel(name = "上级分类字典编码集合")
     private List<String> materialClassifyCodeList;
+    @ApiModelProperty("收费标准")
+    @Excel(name = "收费标准")
+    private String chargeStandard;
 
+    @ApiModelProperty("单位")
+    @Excel(name = "单位")
+    private String unit;
 
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/todo/MaterialClassifyDO.java

@@ -82,4 +82,11 @@ public class MaterialClassifyDO extends BaseVOEntity{
     @ApiModelProperty("上级分类字典编码集合")
     @Excel(name = "上级分类字典编码集合")
     private List<String> materialClassifyCodeList;
-}
+    @ApiModelProperty("收费标准")
+    @Excel(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty("单位")
+    @Excel(name = "单位")
+    private String unit;
+}