diff --git a/base-server/pom.xml b/base-server/pom.xml
index f82352da..b2c88eee 100644
--- a/base-server/pom.xml
+++ b/base-server/pom.xml
@@ -40,11 +40,6 @@
             <artifactId>zt-module-erp-server</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-module-unit-management-server</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <!-- Web 相关 -->
         <dependency>
             <groupId>com.zt.plat</groupId>
diff --git a/pom.xml b/pom.xml
index f912c36d..e5a5726d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
         <module>zt-module-contract-order</module>
         <module>zt-module-erp</module>
         <module>base-server</module>
-        <module>zt-module-unit-management</module>
     </modules>
 
     <name>${project.artifactId}</name>
diff --git a/zt-module-unit-management/zt-module-unit-management-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java
similarity index 100%
rename from zt-module-unit-management/zt-module-unit-management-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java
rename to zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java
index 73d4cafe..459d0190 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java
@@ -28,6 +28,9 @@ public class ElementPageReqVO extends PageParam {
     @Schema(description = "小数位数")
     private Long decimalValue;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java
index f58b14e7..549daf73 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java
@@ -36,6 +36,10 @@ public class ElementRespVO {
     @ExcelProperty("品位单位")
     private String gradeUnit;
 
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private String isEnable;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java
index 6c932298..5d5c8e79 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java
@@ -1,7 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
@@ -21,13 +21,15 @@ public class ElementSaveReqVO {
     private String name;
 
     @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED)
-//    @NotEmpty(message = "金属元素编码不能为空")
     private String coding;
 
     @Schema(description = "小数位数")
-    @NotEmpty(message = "小数位数不能为空")
+    @Min(value = 1, message = "数值必须大于0")
     private Long decimalValue;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
+
     @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "品位单位不能为空")
     private String gradeUnit;
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java
index 938f5eaf..50265f4b 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java
@@ -1,6 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
 import lombok.Data;
 
 @Schema(description = "管理后台 - 物料拓展数据新增/修改 Request VO")
@@ -38,6 +39,7 @@ public class MaterialOtherSaveReqVO {
     private String gradeUnit;
 
     @Schema(description = "小数位数")
+    @Min(value = 1, message = "数值必须大于0")
     private Long decimalValue;
 
     @Schema(description = "是否启用")
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/QuantityUnitRelationController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java
similarity index 94%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/QuantityUnitRelationController.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java
index f6eef72d..e526ea8b 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/QuantityUnitRelationController.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation;
 
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import com.zt.plat.module.unitmanagement.service.QuantityUnitRelation.QuantityUnitRelationService;
+import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.service.quantityUnitRelation.QuantityUnitRelationService;
 
 @Tag(name = "管理后台 - 计量单位量与单位关联")
 @RestController
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/CreateUnitWithRelationReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/CreateUnitWithRelationReqVO.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/CreateUnitWithRelationReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/CreateUnitWithRelationReqVO.java
index 9dee92f3..77a02607 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/CreateUnitWithRelationReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/CreateUnitWithRelationReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java
similarity index 87%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java
index 4d604e3d..6a5c0f97 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java
index d308cfe2..3dd7fbf7 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java
similarity index 88%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java
index 69c8aabe..50c05424 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import lombok.*;
 import java.util.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationRespVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationRespVO.java
index f79d47b9..ae4b4598 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java
similarity index 90%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java
index 8f40f602..ab411bed 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/UnitConversionController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java
similarity index 95%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/UnitConversionController.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java
index 8f5415fd..22ca105b 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/UnitConversionController.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion;
+package com.zt.plat.module.base.controller.admin.unitConversion;
 
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
-import com.zt.plat.module.unitmanagement.service.UnitConversion.UnitConversionService;
+import com.zt.plat.module.base.controller.admin.unitConversion.vo.*;
+import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO;
+import com.zt.plat.module.base.service.unitConversion.UnitConversionService;
 
 @Tag(name = "管理后台 - 单位转换")
 @RestController
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertByNameReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertByNameReqVO.java
similarity index 94%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertByNameReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertByNameReqVO.java
index 035d2f63..b88a07ed 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertByNameReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertByNameReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertBySymbolReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertBySymbolReqVO.java
similarity index 94%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertBySymbolReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertBySymbolReqVO.java
index a0075e64..5447982c 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertBySymbolReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertBySymbolReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertReqVO.java
similarity index 89%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertReqVO.java
index 477951e3..c7866793 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertRespVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertRespVO.java
index 885df3de..8af4fc0b 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionPageReqVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionPageReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionPageReqVO.java
index 0763d9b1..acbe0f7d 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionPageReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionPageReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import lombok.*;
 import java.util.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionRespVO.java
similarity index 94%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionRespVO.java
index 7c599383..078069f5 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionSaveReqVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionSaveReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionSaveReqVO.java
index 19fcaaf0..0e470b13 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionSaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionSaveReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionValidationRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionValidationRespVO.java
similarity index 97%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionValidationRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionValidationRespVO.java
index e1c41d6a..fc7b093f 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionValidationRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionValidationRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertByNameReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertByNameReqVO.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertByNameReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertByNameReqVO.java
index ecf29597..4f1b0ff5 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertByNameReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertByNameReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertBySymbolReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertBySymbolReqVO.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertBySymbolReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertBySymbolReqVO.java
index 933e68e7..3bc792c7 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertBySymbolReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertBySymbolReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertReqVO.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertReqVO.java
index 3793d1e4..bd33987c 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertRespVO.java
similarity index 94%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertRespVO.java
index 47a8915f..83c12f09 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo;
+package com.zt.plat.module.base.controller.admin.unitConversion.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/UnitQuantityController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/UnitQuantityController.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java
index f9017540..8dcf2033 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/UnitQuantityController.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity;
+package com.zt.plat.module.base.controller.admin.unitQuantity;
 
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO;
-import com.zt.plat.module.unitmanagement.service.UnitQuantity.UnitQuantityService;
+import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*;
+import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO;
+import com.zt.plat.module.base.service.unitQuantity.UnitQuantityService;
 
 @Tag(name = "管理后台 - 计量单位量")
 @RestController
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java
similarity index 91%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java
index 3ddd3379..cca60885 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo;
+package com.zt.plat.module.base.controller.admin.unitQuantity.vo;
 
 import lombok.*;
 import java.util.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java
index ad653e34..42e36b6e 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo;
+package com.zt.plat.module.base.controller.admin.unitQuantity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java
index 086ef77f..c6737915 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo;
+package com.zt.plat.module.base.controller.admin.unitQuantity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java
similarity index 95%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java
index 3b1cc2e1..bacbbc70 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo;
+package com.zt.plat.module.base.controller.admin.unitQuantity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/UntInfoController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/UntInfoController.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java
index 6935276a..3fca1775 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/UntInfoController.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UntInfo;
+package com.zt.plat.module.base.controller.admin.untInfo;
 
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
-import com.zt.plat.module.unitmanagement.service.UntInfo.UntInfoService;
+import com.zt.plat.module.base.controller.admin.untInfo.vo.*;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
+import com.zt.plat.module.base.service.untInfo.UntInfoService;
 
 @Tag(name = "管理后台 - 计量单位")
 @RestController
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoPageReqVO.java
similarity index 91%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoPageReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoPageReqVO.java
index b2582c3a..fb9ccbdc 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoPageReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoPageReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo;
+package com.zt.plat.module.base.controller.admin.untInfo.vo;
 
 import lombok.*;
 import java.util.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoRespVO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoRespVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoRespVO.java
index 1ca397a3..3c33bbfc 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoRespVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo;
+package com.zt.plat.module.base.controller.admin.untInfo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoSaveReqVO.java
similarity index 91%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoSaveReqVO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoSaveReqVO.java
index 32aabe3c..cf86bfb9 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoSaveReqVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoSaveReqVO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo;
+package com.zt.plat.module.base.controller.admin.untInfo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation/QuantityUnitRelationMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation/QuantityUnitRelationMapper.java
similarity index 82%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation/QuantityUnitRelationMapper.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation/QuantityUnitRelationMapper.java
index 60ca4a09..81eba42d 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation/QuantityUnitRelationMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation/QuantityUnitRelationMapper.java
@@ -1,13 +1,13 @@
-package com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation;
+package com.zt.plat.module.base.dal.dao.quantityUnitRelation;
 
 import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*;
+import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*;
 
 /**
  * 计量单位量与单位关联 Mapper
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion/UnitConversionMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion/UnitConversionMapper.java
similarity index 80%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion/UnitConversionMapper.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion/UnitConversionMapper.java
index 53a4bb71..4717e737 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion/UnitConversionMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion/UnitConversionMapper.java
@@ -1,13 +1,11 @@
-package com.zt.plat.module.unitmanagement.dal.dao.UnitConversion;
-
-import java.util.*;
+package com.zt.plat.module.base.dal.dao.unitConversion;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
+import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*;
+import com.zt.plat.module.base.controller.admin.unitConversion.vo.*;
 
 /**
  * 单位转换 Mapper
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/unitQuantity/UnitQuantityMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitQuantity/UnitQuantityMapper.java
similarity index 78%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/unitQuantity/UnitQuantityMapper.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitQuantity/UnitQuantityMapper.java
index 56292e08..31ef0923 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/unitQuantity/UnitQuantityMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitQuantity/UnitQuantityMapper.java
@@ -1,13 +1,11 @@
-package com.zt.plat.module.unitmanagement.dal.dao.UnitQuantity;
-
-import java.util.*;
+package com.zt.plat.module.base.dal.dao.unitQuantity;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO;
+import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*;
+import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*;
 
 /**
  * 计量单位量 Mapper
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo/UntInfoMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo/UntInfoMapper.java
similarity index 77%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo/UntInfoMapper.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo/UntInfoMapper.java
index 16640fbc..b4c415fa 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo/UntInfoMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo/UntInfoMapper.java
@@ -1,13 +1,11 @@
-package com.zt.plat.module.unitmanagement.dal.dao.UntInfo;
-
-import java.util.*;
+package com.zt.plat.module.base.dal.dao.untInfo;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*;
+import com.zt.plat.module.base.controller.admin.untInfo.vo.*;
 
 /**
  * 计量单位 Mapper
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java
index ba2870dd..32ed81b1 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java
@@ -48,6 +48,11 @@ public class ElementDO extends BusinessBaseDO {
     */
     @TableField("DEC")
     private Long decimalValue;
+    /**
+     * 是否启用
+     */
+    @TableField("IS_ENB")
+    private String isEnable;
     /**
     * 品位单位
     */
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation/QuantityUnitRelationDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation/QuantityUnitRelationDO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation/QuantityUnitRelationDO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation/QuantityUnitRelationDO.java
index b8cf8774..c4c6a1a8 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation/QuantityUnitRelationDO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation/QuantityUnitRelationDO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation;
+package com.zt.plat.module.base.dal.dataobject.quantityUnitRelation;
 
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion/UnitConversionDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion/UnitConversionDO.java
similarity index 94%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion/UnitConversionDO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion/UnitConversionDO.java
index 82679d4a..520d80b7 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion/UnitConversionDO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion/UnitConversionDO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion;
+package com.zt.plat.module.base.dal.dataobject.unitConversion;
 
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/unitQuantity/UnitQuantityDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitQuantity/UnitQuantityDO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/unitQuantity/UnitQuantityDO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitQuantity/UnitQuantityDO.java
index a2cd8e22..a1f4dff5 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/unitQuantity/UnitQuantityDO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitQuantity/UnitQuantityDO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity;
+package com.zt.plat.module.base.dal.dataobject.unitQuantity;
 
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo/UntInfoDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo/UntInfoDO.java
similarity index 93%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo/UntInfoDO.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo/UntInfoDO.java
index 1474f19b..5d42a2a9 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo/UntInfoDO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo/UntInfoDO.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo;
+package com.zt.plat.module.base.dal.dataobject.untInfo;
 
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java
index ec0d30b5..fa89ea4d 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java
@@ -25,8 +25,8 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
                 .likeIfPresent(AccountDO::getAddress, reqVO.getAddress())
                 .likeIfPresent(AccountDO::getPhone, reqVO.getPhone())
                 .eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount())
-                .eqIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName())
-                .eqIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber())
+                .likeIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName())
+                .likeIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable())
                 .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber())
                 .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber())
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java
index a1e4dca3..9f6557a4 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java
@@ -18,9 +18,9 @@ public interface ContactMapper extends BaseMapperX<ContactDO> {
     default PageResult<ContactDO> selectPage(ContactPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ContactDO>()
                 .eqIfPresent(ContactDO::getType, reqVO.getType())
-                .eqIfPresent(ContactDO::getContact, reqVO.getContact())
-                .eqIfPresent(ContactDO::getTel, reqVO.getTel())
-                .eqIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName())
+                .likeIfPresent(ContactDO::getContact, reqVO.getContact())
+                .likeIfPresent(ContactDO::getTel, reqVO.getTel())
+                .likeIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName())
                 .eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable())
                 .eqIfPresent(ContactDO::getEmail, reqVO.getEmail())
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java
index 8e911140..83b90bbd 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java
@@ -20,10 +20,10 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
 
     default PageResult<ElementDO> selectPage(ElementPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ElementDO>()
-                .eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation())
+                .likeIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation())
                 .likeIfPresent(ElementDO::getName, reqVO.getName())
                 .eqIfPresent(ElementDO::getDecimalValue, reqVO.getDecimalValue())
-                .eqIfPresent(ElementDO::getCoding, reqVO.getCoding())
+                .likeIfPresent(ElementDO::getCoding, reqVO.getCoding())
                 .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit())
                 .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ElementDO::getId));
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java
index 3ae38878..121a4be2 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java
@@ -17,12 +17,14 @@ public interface MaterialDestroyMapper extends BaseMapperX<MaterialDestroyDO> {
 
     default PageResult<MaterialDestroyDO> selectPage(MaterialDestroyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDestroyDO>()
-                .eqIfPresent(MaterialDestroyDO::getUpNumber, reqVO.getUpNumber())
-                .eqIfPresent(MaterialDestroyDO::getDownNumber, reqVO.getDownNumber())
+                .likeIfPresent(MaterialDestroyDO::getUpNumber, reqVO.getUpNumber())
+                .likeIfPresent(MaterialDestroyDO::getUpName, reqVO.getUpName())
+                .likeIfPresent(MaterialDestroyDO::getDownNumber, reqVO.getDownNumber())
+                .likeIfPresent(MaterialDestroyDO::getDownName, reqVO.getDownName())
                 .eqIfPresent(MaterialDestroyDO::getRatio, reqVO.getRatio())
                 .eqIfPresent(MaterialDestroyDO::getOperation, reqVO.getOperation())
                 .betweenIfPresent(MaterialDestroyDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber())
+                .likeIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber())
                 .likeIfPresent(MaterialDestroyDO::getSupplierName, reqVO.getSupplierName())
                 .eqIfPresent(MaterialDestroyDO::getIsEnable, reqVO.getIsEnable())
                 .orderByDesc(MaterialDestroyDO::getId));
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java
index f3ff8951..af4a1396 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java
@@ -20,7 +20,7 @@ public interface MaterialOtherMapper extends BaseMapperX<MaterialOtherDO> {
 
     default PageResult<MaterialOtherDO> selectPage(MaterialOtherPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialOtherDO>()
-                .eqIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber())
+                .likeIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber())
                 .likeIfPresent(MaterialOtherDO::getMaterialName, reqVO.getMaterialName())
                 .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber())
                 .likeIfPresent(MaterialOtherDO::getErpMaterialName, reqVO.getErpMaterialName())
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationService.java
similarity index 88%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationService.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationService.java
index 61e42e91..d4d03322 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationService.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationService.java
@@ -1,11 +1,10 @@
-package com.zt.plat.module.unitmanagement.service.QuantityUnitRelation;
+package com.zt.plat.module.base.service.quantityUnitRelation;
 
 import java.util.*;
 import jakarta.validation.*;
-import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 计量单位量与单位关联 Service 接口
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationServiceImpl.java
similarity index 89%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationServiceImpl.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationServiceImpl.java
index 1a1be0d7..824224df 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.service.QuantityUnitRelation;
+package com.zt.plat.module.base.service.quantityUnitRelation;
 
 import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
@@ -7,20 +7,18 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 
-import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper;
-import com.zt.plat.module.unitmanagement.service.UntInfo.UntInfoService;
-import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.UntInfoSaveReqVO;
-import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.UntInfoRespVO;
+import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper;
+import com.zt.plat.module.base.service.untInfo.UntInfoService;
+import com.zt.plat.module.base.controller.admin.untInfo.vo.UntInfoSaveReqVO;
+import com.zt.plat.module.base.controller.admin.untInfo.vo.UntInfoRespVO;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
 import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*;
 
 /**
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionHelperService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionHelperService.java
similarity index 92%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionHelperService.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionHelperService.java
index 62b9da56..ec766d26 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionHelperService.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionHelperService.java
@@ -1,12 +1,12 @@
-package com.zt.plat.module.unitmanagement.service.UnitConversion;
+package com.zt.plat.module.base.service.unitConversion;
 
-import com.zt.plat.module.unitmanagement.dal.dao.UnitConversion.UnitConversionMapper;
-import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper;
-import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
-import com.zt.plat.module.unitmanagement.util.UnitConversionUtil;
+import com.zt.plat.module.base.dal.dao.unitConversion.UnitConversionMapper;
+import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper;
+import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper;
+import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
+import com.zt.plat.module.base.util.UnitConversionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionService.java
similarity index 90%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionService.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionService.java
index 67fdd2da..7c1d837c 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionService.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionService.java
@@ -1,11 +1,10 @@
-package com.zt.plat.module.unitmanagement.service.UnitConversion;
+package com.zt.plat.module.base.service.unitConversion;
 
 import java.util.*;
 import jakarta.validation.*;
-import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
+import com.zt.plat.module.base.controller.admin.unitConversion.vo.*;
+import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 单位转换 Service 接口
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionServiceImpl.java
similarity index 95%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionServiceImpl.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionServiceImpl.java
index 75078038..c0ba4e41 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionServiceImpl.java
@@ -1,26 +1,24 @@
-package com.zt.plat.module.unitmanagement.service.UnitConversion;
+package com.zt.plat.module.base.service.unitConversion;
 
 import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
+import com.zt.plat.module.base.controller.admin.unitConversion.vo.*;
+import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 
-import com.zt.plat.module.unitmanagement.dal.dao.UnitConversion.UnitConversionMapper;
-import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper;
-import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO;
-import com.zt.plat.module.unitmanagement.service.UnitQuantity.UnitQuantityService;
-import com.zt.plat.module.unitmanagement.util.UnitConversionUtil;
+import com.zt.plat.module.base.dal.dao.unitConversion.UnitConversionMapper;
+import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper;
+import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
+import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO;
+import com.zt.plat.module.base.service.unitQuantity.UnitQuantityService;
+import com.zt.plat.module.base.util.UnitConversionUtil;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import lombok.extern.slf4j.Slf4j;
 
@@ -29,7 +27,6 @@ import java.util.stream.Collectors;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
 import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*;
 
 /**
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityService.java
similarity index 82%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityService.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityService.java
index ef5c4caf..34ce2027 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityService.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityService.java
@@ -1,11 +1,10 @@
-package com.zt.plat.module.unitmanagement.service.UnitQuantity;
+package com.zt.plat.module.base.service.unitQuantity;
 
 import java.util.*;
 import jakarta.validation.*;
-import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO;
+import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*;
+import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 计量单位量 Service 接口
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityServiceImpl.java
similarity index 84%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityServiceImpl.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityServiceImpl.java
index 5a482c34..c8566cc8 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityServiceImpl.java
@@ -1,28 +1,25 @@
-package com.zt.plat.module.unitmanagement.service.UnitQuantity;
+package com.zt.plat.module.base.service.unitQuantity;
 
 import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO;
+import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*;
+import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 
-import com.zt.plat.module.unitmanagement.dal.dao.UnitQuantity.UnitQuantityMapper;
-import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper;
-import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
+import com.zt.plat.module.base.dal.dao.unitQuantity.UnitQuantityMapper;
+import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper;
+import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
 import java.util.stream.Collectors;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
 import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*;
 
 /**
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoService.java
similarity index 81%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoService.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoService.java
index 37a8967b..2bd0a889 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoService.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoService.java
@@ -1,11 +1,10 @@
-package com.zt.plat.module.unitmanagement.service.UntInfo;
+package com.zt.plat.module.base.service.untInfo;
 
 import java.util.*;
 import jakarta.validation.*;
-import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
+import com.zt.plat.module.base.controller.admin.untInfo.vo.*;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 计量单位 Service 接口
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoServiceImpl.java
similarity index 83%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoServiceImpl.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoServiceImpl.java
index ea38763e..0516ccaa 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoServiceImpl.java
@@ -1,23 +1,20 @@
-package com.zt.plat.module.unitmanagement.service.UntInfo;
+package com.zt.plat.module.base.service.untInfo;
 
 import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
+import com.zt.plat.module.base.controller.admin.untInfo.vo.*;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 
-import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper;
+import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
 import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*;
 
 /**
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtil.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/UnitConversionUtil.java
similarity index 97%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtil.java
rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/UnitConversionUtil.java
index 23f06434..2298332d 100644
--- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtil.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/UnitConversionUtil.java
@@ -1,14 +1,13 @@
-package com.zt.plat.module.unitmanagement.util;
+package com.zt.plat.module.base.util;
 
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO;
+import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO;
 import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/QuantityUnitRelation/QuantityUnitRelationMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/QuantityUnitRelation/QuantityUnitRelationMapper.xml
similarity index 100%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/QuantityUnitRelation/QuantityUnitRelationMapper.xml
rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/QuantityUnitRelation/QuantityUnitRelationMapper.xml
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/UnitConversion/UnitConversionMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/UnitConversion/UnitConversionMapper.xml
similarity index 100%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/UnitConversion/UnitConversionMapper.xml
rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/UnitConversion/UnitConversionMapper.xml
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/unitQuantity/UnitQuantityMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/unitQuantity/UnitQuantityMapper.xml
similarity index 100%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/unitQuantity/UnitQuantityMapper.xml
rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/unitQuantity/UnitQuantityMapper.xml
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/untinfo/UntInfoMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/untinfo/UntInfoMapper.xml
similarity index 100%
rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/untinfo/UntInfoMapper.xml
rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/untinfo/UntInfoMapper.xml
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java
index 52677016..df082ac6 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java
@@ -2,6 +2,7 @@ package com.zt.plat.module.erp.controller.admin.erp.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -82,6 +83,7 @@ public class ErpMaterialSaveReqVO {
     private String gradeUnit;
 
     @Schema(description = "小数位数")
+    @Min(value = 1, message = "数值必须大于0")
     private Long decimalValue;
 
 }
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java
index ded32ed6..d1a95595 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java
@@ -20,7 +20,7 @@ public interface ErpMaterialMapper extends BaseMapperX<ErpMaterialDO> {
 
     default PageResult<ErpMaterialDO> selectPage(ErpMaterialPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpMaterialDO>()
-                .eqIfPresent(ErpMaterialDO::getDownCenterNumber, reqVO.getDownCenterNumber())
+                .likeIfPresent(ErpMaterialDO::getDownCenterNumber, reqVO.getDownCenterNumber())
                 .eqIfPresent(ErpMaterialDO::getCenterNumber, reqVO.getCenterNumber())
                 .betweenIfPresent(ErpMaterialDO::getCreateDate, reqVO.getCreateDate())
                 .eqIfPresent(ErpMaterialDO::getMaterialType, reqVO.getMaterialType())
diff --git a/zt-module-unit-management/pom.xml b/zt-module-unit-management/pom.xml
deleted file mode 100644
index d23f6dfa..00000000
--- a/zt-module-unit-management/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dsc-base</artifactId>
-        <groupId>com.zt.plat</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modules>
-        <module>zt-module-unit-management-api</module>
-        <module>zt-module-unit-management-server</module>
-    </modules>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>zt-module-unit-management</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        计量单位 模块。
-    </description>
-
-</project>
diff --git a/zt-module-unit-management/zt-module-unit-management-api/pom.xml b/zt-module-unit-management/zt-module-unit-management-api/pom.xml
deleted file mode 100644
index a3915ed3..00000000
--- a/zt-module-unit-management/zt-module-unit-management-api/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>zt-module-unit-management</artifactId>
-        <groupId>com.zt.plat</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>zt-module-unit-management-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-common</artifactId>
-        </dependency>
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>org.springdoc</groupId> <!-- 接口文档：使用最新版本的 Swagger 模型 -->
-            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/zt-module-unit-management/zt-module-unit-management-server/pom.xml b/zt-module-unit-management/zt-module-unit-management-server/pom.xml
deleted file mode 100644
index d7463396..00000000
--- a/zt-module-unit-management/zt-module-unit-management-server/pom.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>zt-module-unit-management</artifactId>
-        <groupId>com.zt.plat</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-
-    <artifactId>zt-module-unit-management-server</artifactId>
-
-    <name>${project.artifactId}</name>
-    <description>
-        计量单位管理 模块。
-    </description>
-
-    <dependencies>
-        <!-- Spring Cloud 基础 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-env</artifactId>
-        </dependency>
-
-        <!-- 依赖服务 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-module-system-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-module-infra-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-module-unit-management-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-biz-data-permission</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-rpc</artifactId>
-        </dependency>
-
-        <!-- Registry 注册中心相关 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- Config 配置中心相关 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- Job 定时任务相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-job</artifactId>
-        </dependency>
-
-        <!-- 消息队列相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-mq</artifactId>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-excel</artifactId>
-        </dependency>
-
-        <!-- 监控相关 -->
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-monitor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-spring-boot-starter-biz-business</artifactId>
-            <version>${revision}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${project.artifactId}</finalName>
-        <!--        <plugins>-->
-        <!--            &lt;!&ndash; 打包 &ndash;&gt;-->
-        <!--            <plugin>-->
-        <!--                <groupId>org.springframework.boot</groupId>-->
-        <!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-        <!--                <version>${spring.boot.version}</version>-->
-        <!--                <executions>-->
-        <!--                    <execution>-->
-        <!--                        <goals>-->
-        <!--                            <goal>repackage</goal> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
-        <!--                        </goals>-->
-        <!--                    </execution>-->
-        <!--                </executions>-->
-        <!--            </plugin>-->
-        <!--        </plugins>-->
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java b/zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java
deleted file mode 100644
index 732f50a0..00000000
--- a/zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.zt.plat.module.unitmanagement.util;
-
-import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.DisplayName;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * UnitConversionUtil 工具类测试
- *
- * 测试内容：
- * 1. 相同单位转换
- * 2. 直接转换策略
- * 3. 基准单位转换策略
- * 4. 精度控制
- * 5. 批量转换
- * 6. 错误场景
- */
-class UnitConversionUtilTest {
-
-    /**
-     * 准备测试数据
-     */
-    private TestData prepareTestData() {
-        TestData data = new TestData();
-
-        // 量纲ID
-        Long lengthQuantityId = 1L;
-        Long weightQuantityId = 2L;
-
-        // 单位ID
-        Long meterId = 101L;      // 米（基准）
-        Long kilometerId = 102L;  // 千米
-        Long centimeterId = 103L; // 厘米
-        Long millimeterId = 104L; // 毫米
-        Long kilogramId = 201L;   // 千克（基准）
-        Long tonId = 202L;        // 吨
-
-        // 构建量纲-单位关联关系
-        data.relations = new ArrayList<>();
-        data.relations.add(createRelation(1L, lengthQuantityId, meterId, 1));      // 米是基准
-        data.relations.add(createRelation(2L, lengthQuantityId, kilometerId, 0));
-        data.relations.add(createRelation(3L, lengthQuantityId, centimeterId, 0));
-        data.relations.add(createRelation(4L, lengthQuantityId, millimeterId, 0));
-        data.relations.add(createRelation(5L, weightQuantityId, kilogramId, 1));   // 千克是基准
-        data.relations.add(createRelation(6L, weightQuantityId, tonId, 0));
-
-        // 构建转换规则（只配置到基准单位的转换）
-        data.conversions = new ArrayList<>();
-
-        // 千米 <-> 米
-        data.conversions.add(createConversion(1L, kilometerId, meterId, new BigDecimal("1000"), "1km = 1000m"));
-        data.conversions.add(createConversion(2L, meterId, kilometerId, new BigDecimal("0.001"), "1m = 0.001km"));
-
-        // 厘米 <-> 米
-        data.conversions.add(createConversion(3L, centimeterId, meterId, new BigDecimal("0.01"), "1cm = 0.01m"));
-        data.conversions.add(createConversion(4L, meterId, centimeterId, new BigDecimal("100"), "1m = 100cm"));
-
-        // 毫米 <-> 米
-        data.conversions.add(createConversion(5L, millimeterId, meterId, new BigDecimal("0.001"), "1mm = 0.001m"));
-        data.conversions.add(createConversion(6L, meterId, millimeterId, new BigDecimal("1000"), "1m = 1000mm"));
-
-        // 吨 <-> 千克
-        data.conversions.add(createConversion(7L, tonId, kilogramId, new BigDecimal("1000"), "1t = 1000kg"));
-        data.conversions.add(createConversion(8L, kilogramId, tonId, new BigDecimal("0.001"), "1kg = 0.001t"));
-
-        // 保存单位ID供测试使用
-        data.meterId = meterId;
-        data.kilometerId = kilometerId;
-        data.centimeterId = centimeterId;
-        data.millimeterId = millimeterId;
-        data.kilogramId = kilogramId;
-        data.tonId = tonId;
-
-        return data;
-    }
-
-    private QuantityUnitRelationDO createRelation(Long id, Long quantityId, Long unitId, Integer isBase) {
-        QuantityUnitRelationDO relation = new QuantityUnitRelationDO();
-        relation.setId(id);
-        relation.setUntQtyId(quantityId);
-        relation.setUntId(unitId);
-        relation.setIsBse(isBase);
-        return relation;
-    }
-
-    private UnitConversionDO createConversion(Long id, Long srcId, Long tgtId, BigDecimal factor, String formula) {
-        UnitConversionDO conversion = new UnitConversionDO();
-        conversion.setId(id);
-        conversion.setSrcUntId(srcId);
-        conversion.setTgtUntId(tgtId);
-        conversion.setFctr(factor);
-        conversion.setFmu(formula);
-        return conversion;
-    }
-
-    @Test
-    @DisplayName("测试1: 相同单位转换")
-    void testSameUnitConversion() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("100");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.meterId, data.meterId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(value, result.getValue(), "相同单位转换，值应该不变");
-        assertEquals(BigDecimal.ONE, result.getFactor(), "相同单位转换，因子应该为1");
-        assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy(), "相同单位应使用DIRECT策略");
-    }
-
-    @Test
-    @DisplayName("测试2: 直接转换策略 - 千米到米")
-    void testDirectConversion_KmToM() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("5.5");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.kilometerId, data.meterId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(new BigDecimal("5500.000000"), result.getValue(), "5.5km应该等于5500m");
-        assertEquals(new BigDecimal("1000"), result.getFactor(), "千米到米的因子应该是1000");
-        assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy(), "应使用DIRECT策略");
-    }
-
-    @Test
-    @DisplayName("测试3: 直接转换策略 - 米到千米")
-    void testDirectConversion_MToKm() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("5000");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.meterId, data.kilometerId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(new BigDecimal("5.000000"), result.getValue(), "5000m应该等于5km");
-        assertEquals(new BigDecimal("0.001"), result.getFactor(), "米到千米的因子应该是0.001");
-        assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy(), "应使用DIRECT策略");
-    }
-
-    @Test
-    @DisplayName("测试4: 基准单位转换策略 - 厘米到千米")
-    void testViaBaseUnitConversion_CmToKm() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("100000");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.centimeterId, data.kilometerId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(new BigDecimal("1.000000"), result.getValue(), "100000cm应该等于1km");
-        assertEquals(UnitConversionUtil.ConversionStrategy.VIA_BASE_UNIT, result.getStrategy(),
-            "厘米到千米应使用VIA_BASE_UNIT策略");
-        assertTrue(result.getFormula().contains("基准单位"), "公式应该提到基准单位");
-    }
-
-    @Test
-    @DisplayName("测试5: 基准单位转换策略 - 毫米到千米")
-    void testViaBaseUnitConversion_MmToKm() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("1000000");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.millimeterId, data.kilometerId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(new BigDecimal("1.000000"), result.getValue(), "1000000mm应该等于1km");
-        assertEquals(UnitConversionUtil.ConversionStrategy.VIA_BASE_UNIT, result.getStrategy(),
-            "毫米到千米应使用VIA_BASE_UNIT策略");
-    }
-
-    @Test
-    @DisplayName("测试6: 精度控制 - 2位小数")
-    void testPrecisionControl_2Digits() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("1.23456789");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.kilometerId, data.meterId,
-            data.conversions, data.relations, 2
-        );
-
-        assertEquals(new BigDecimal("1234.57"), result.getValue(), "精度应该控制在2位小数");
-    }
-
-    @Test
-    @DisplayName("测试7: 精度控制 - 6位小数")
-    void testPrecisionControl_6Digits() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("1.23456789");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.kilometerId, data.meterId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(new BigDecimal("1234.567890"), result.getValue(), "精度应该控制在6位小数");
-    }
-
-    @Test
-    @DisplayName("测试8: 批量转换")
-    void testBatchConversion() {
-        TestData data = prepareTestData();
-
-        List<BigDecimal> values = new ArrayList<>();
-        values.add(new BigDecimal("1"));
-        values.add(new BigDecimal("2"));
-        values.add(new BigDecimal("3"));
-
-        List<UnitConversionUtil.ConversionResult> results = UnitConversionUtil.batchConvert(
-            values, data.kilometerId, data.meterId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(3, results.size(), "应该返回3个转换结果");
-        assertEquals(new BigDecimal("1000.000000"), results.get(0).getValue(), "1km = 1000m");
-        assertEquals(new BigDecimal("2000.000000"), results.get(1).getValue(), "2km = 2000m");
-        assertEquals(new BigDecimal("3000.000000"), results.get(2).getValue(), "3km = 3000m");
-    }
-
-
-
-    @Test
-    @DisplayName("测试10: 重量单位转换 - 千克到吨")
-    void testWeightConversion_KgToTon() {
-        TestData data = prepareTestData();
-
-        BigDecimal value = new BigDecimal("1000");
-        UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert(
-            value, data.kilogramId, data.tonId,
-            data.conversions, data.relations, 6
-        );
-
-        assertEquals(new BigDecimal("1.000000"), result.getValue(), "1000kg应该等于1t");
-        assertEquals(new BigDecimal("0.001"), result.getFactor(), "千克到吨的因子应该是0.001");
-        assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy());
-    }
-
-    /**
-     * 测试数据容器
-     */
-    static class TestData {
-        List<UnitConversionDO> conversions;
-        List<QuantityUnitRelationDO> relations;
-        Long meterId;
-        Long kilometerId;
-        Long centimeterId;
-        Long millimeterId;
-        Long kilogramId;
-        Long tonId;
-    }
-}