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_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -227,4 +227,14 @@ public class MaterialBaseInfo extends BaseVOEntity {
     @Excel(name = "毛重（kg）")
     private BigDecimal grossWeight;
 
-}
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty(name = "单位")
+    private String unit;
+
+}

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java

@@ -274,5 +274,13 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
 
     @ApiModelProperty(name = "推送人名称")
     private String pushByName;
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
 
+    @ApiModelProperty(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty(name = "单位")
+    private String unit;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java

@@ -250,4 +250,13 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
 
     @ApiModelProperty("更新时间止")
     private String updateTimeEnd;
-}
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty(name = "单位")
+    private String unit;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -302,4 +302,13 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
 
     @ApiModelProperty(name = "推送人名称")
     private String pushByName;
-}
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty(name = "单位")
+    private String unit;
+}