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
2026-06-16 11:11:48 +08:00
parent b05baac0e5 9922fee6cc
commit dd4fc13adc
46 changed files with 660 additions and 225 deletions
@@ -234,5 +234,14 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{

    @ApiModelProperty("批次ID")
    private Long batchId;
-}

+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty(name = "单位")
+    private String unit;
+}