完善代码生成

pom.xml

@@ -51,6 +51,14 @@
     </pluginRepositories>
     <dependencies>
 
+
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>

src/main/java/cn/lihongjie/coal/Codegen.java

@@ -10,6 +10,7 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import cn.lihongjie.coal.base.entity.CommonEntity;
 import cn.lihongjie.coal.base.entity.OrgCommonEntity;
 import cn.lihongjie.coal.base.mapper.BaseMapper;
+import cn.lihongjie.coal.base.mapper.CommonEntityMapper;
 import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.base.service.BaseService;
 
@@ -155,7 +156,7 @@ public class Codegen {
                                                 "componentModel",
                                                 "org.mapstruct.MappingConstants.ComponentModel.SPRING",
                                                 "")
-                                        .addMember("uses", "{$T.class}", CommonMapper.class)
+                                        .addMember("uses", "{$T.class, $T.class}", CommonMapper.class, CommonEntityMapper.class)
                                         .addMember("mappingControl", "$T.class", DeepClone.class)
                                         .build())
                         .addSuperinterface(

src/main/java/cn/lihongjie/coal/EntityMapperGen.java

@@ -0,0 +1,124 @@
+package cn.lihongjie.coal;
+
+import static org.reflections.scanners.Scanners.SubTypes;
+import static org.reflections.scanners.Scanners.TypesAnnotated;
+
+import com.google.googlejavaformat.java.Formatter;
+import com.google.googlejavaformat.java.JavaFormatterOptions;
+import com.squareup.javapoet.*;
+
+import jakarta.persistence.Entity;
+
+import lombok.SneakyThrows;
+
+import org.mapstruct.Mapper;
+import org.reflections.Reflections;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+import javax.lang.model.element.Modifier;
+
+/**
+ * google-java-format uses internal javac APIs for parsing Java source. The following JVM flags are
+ * required when running on JDK 16 and newer, due to JEP 396: Strongly Encapsulate JDK Internals by
+ * Default:
+ *
+ * <p>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+ * --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+ * --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+ * --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+ * --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+ * --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ */
+public class EntityMapperGen {
+
+    public static final Path DIRECTORY = Path.of("src/main/java/");
+
+    @SneakyThrows
+    public static void main(String[] args) {
+
+        Reflections reflections = new Reflections("cn.lihongjie.coal");
+
+        Set<String> entityClasses =
+                reflections.get(SubTypes.of(TypesAnnotated.with(Entity.class)));
+
+        // 生成entity
+
+        TypeSpec.Builder entityMapperBuilder =
+                TypeSpec.interfaceBuilder("CommonEntityMapper")
+                        .addModifiers(Modifier.PUBLIC)
+                        .addAnnotation(
+                                AnnotationSpec.builder(Mapper.class)
+                                        .addMember("componentModel", "\"spring\"")
+                                        .build());
+
+
+
+        for (String e : entityClasses) {
+            Class<?> entityClass = Class.forName(e);
+            System.out.println("entityClass = " + entityClass);
+
+            MethodSpec.Builder methodBuilder =
+                    MethodSpec.methodBuilder("create" + entityClass.getSimpleName());
+            methodBuilder.addModifiers(Modifier.PUBLIC);
+            methodBuilder.addModifiers(Modifier.DEFAULT);
+            methodBuilder.returns(ClassName.get(entityClass));
+            methodBuilder.addParameter(ClassName.get(String.class), "id");
+            methodBuilder.addStatement(
+                    """
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new $T();
+        e.setId(id);
+        return e
+
+""",
+                    ClassName.get(entityClass));
+            entityMapperBuilder.addMethod(methodBuilder.build());
+        }
+
+        saveFile("cn.lihongjie.coal.base.mapper", entityMapperBuilder.build());
+    }
+
+    @SneakyThrows
+    private static void saveFile(String pkg, TypeSpec entity) throws IOException {
+
+        JavaFile javaFile = JavaFile.builder(pkg, entity).build();
+
+        Path outputDirectory = DIRECTORY;
+        if (!javaFile.packageName.isEmpty()) {
+            for (String packageComponent : javaFile.packageName.split("\\.")) {
+                outputDirectory = outputDirectory.resolve(packageComponent);
+            }
+            Files.createDirectories(outputDirectory);
+        }
+
+        Path outputPath = outputDirectory.resolve(javaFile.typeSpec.name + ".java");
+        try (Writer writer =
+                new OutputStreamWriter(Files.newOutputStream(outputPath), StandardCharsets.UTF_8)) {
+
+            StringWriter out = new StringWriter();
+            javaFile.writeTo(out);
+
+            String formattedSource =
+                    new Formatter(
+                                    JavaFormatterOptions.builder()
+                                            .style(JavaFormatterOptions.Style.AOSP)
+                                            .formatJavadoc(true)
+                                            .reorderModifiers(true)
+                                            .build())
+                            .formatSource(out.toString());
+
+            writer.write(formattedSource);
+        }
+    }
+}

src/main/java/cn/lihongjie/coal/base/mapper/CommonEntityMapper.java

@@ -0,0 +1,591 @@
+package cn.lihongjie.coal.base.mapper;
+
+import cn.lihongjie.coal.cacheCtl.entity.CacheCtlEntity;
+import cn.lihongjie.coal.coalAnalysis.entity.CoalAnalysisEntity;
+import cn.lihongjie.coal.coalAnalysisHis.entity.CoalAnalysisHisEntity;
+import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity;
+import cn.lihongjie.coal.coalBlend.entity.CoalBlendEntity;
+import cn.lihongjie.coal.coalBlend.entity.CoalBlendResultInfoEntity;
+import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity;
+import cn.lihongjie.coal.coalParameterDef.entity.CoalParameterDefEntity;
+import cn.lihongjie.coal.coalPrice.entity.CoalPriceEntity;
+import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisEntity;
+import cn.lihongjie.coal.coalWashingDailyAnalysisParam.entity.CoalWashingDailyAnalysisParamEntity;
+import cn.lihongjie.coal.cronJob.entity.CronJobEntity;
+import cn.lihongjie.coal.cronJobLog.entity.CronJobLogEntity;
+import cn.lihongjie.coal.deliveryInformation.entity.DeliveryInformationEntity;
+import cn.lihongjie.coal.department.entity.DepartmentEntity;
+import cn.lihongjie.coal.dictionary.entity.DictionaryEntity;
+import cn.lihongjie.coal.dictionary.entity.DictionaryItemEntity;
+import cn.lihongjie.coal.downloadCenter.entity.DownloadCenterEntity;
+import cn.lihongjie.coal.employee.entity.EmployeeEntity;
+import cn.lihongjie.coal.enterprise.entity.EnterpriseEntity;
+import cn.lihongjie.coal.file.entity.FileEntity;
+import cn.lihongjie.coal.inventoryCheck.entity.InventoryCheckEntity;
+import cn.lihongjie.coal.inventoryCheckDetail.entity.InventoryCheckDetailEntity;
+import cn.lihongjie.coal.ipList.entity.IpListEntity;
+import cn.lihongjie.coal.jobPost.entity.JobPostEntity;
+import cn.lihongjie.coal.loginUser.entity.LoginUserEntity;
+import cn.lihongjie.coal.loginUserHis.entity.LoginUserHisEntity;
+import cn.lihongjie.coal.meter.entity.MeterEntity;
+import cn.lihongjie.coal.meterDayLog.entity.MeterDayLogEntity;
+import cn.lihongjie.coal.meterLog.entity.MeterLogEntity;
+import cn.lihongjie.coal.meterMonthLog.entity.MeterMonthLogEntity;
+import cn.lihongjie.coal.netDisk.entity.NetDiskEntity;
+import cn.lihongjie.coal.noteBook.entity.NoteBookEntity;
+import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity;
+import cn.lihongjie.coal.notice.entity.NoticeEntity;
+import cn.lihongjie.coal.noticeStatus.entity.NoticeStatusEntity;
+import cn.lihongjie.coal.organization.entity.OrganizationEntity;
+import cn.lihongjie.coal.passwordDict.entity.PasswordDictEntity;
+import cn.lihongjie.coal.pdfGenerator.entity.PdfGeneratorEntity;
+import cn.lihongjie.coal.permission.entity.PermissionEntity;
+import cn.lihongjie.coal.product.entity.ProductEntity;
+import cn.lihongjie.coal.purchaseOrder.entity.PurchaseOrderEntity;
+import cn.lihongjie.coal.resetPwd.entity.ResetPwdEntity;
+import cn.lihongjie.coal.resource.entity.ResourceEntity;
+import cn.lihongjie.coal.role.entity.RoleEntity;
+import cn.lihongjie.coal.salaryItem.entity.SalaryItemEntity;
+import cn.lihongjie.coal.script.entity.ScriptEntity;
+import cn.lihongjie.coal.sms.entity.SmsEntity;
+import cn.lihongjie.coal.smsTemplate.entity.SmsTemplateEntity;
+import cn.lihongjie.coal.supplier.entity.SupplierEntity;
+import cn.lihongjie.coal.sysconfig.entity.SysConfigEntity;
+import cn.lihongjie.coal.syslog.entity.SysLogEntity;
+import cn.lihongjie.coal.user.entity.UserEntity;
+
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface CommonEntityMapper {
+    default CoalWashingDailyAnalysisEntity createCoalWashingDailyAnalysisEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalWashingDailyAnalysisEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalInfoEntity createCoalInfoEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalInfoEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default MeterLogEntity createMeterLogEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new MeterLogEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default InventoryCheckDetailEntity createInventoryCheckDetailEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new InventoryCheckDetailEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default ScriptEntity createScriptEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new ScriptEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalPriceEntity createCoalPriceEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalPriceEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default OrganizationEntity createOrganizationEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new OrganizationEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default RoleEntity createRoleEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new RoleEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default DownloadCenterEntity createDownloadCenterEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new DownloadCenterEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default DictionaryItemEntity createDictionaryItemEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new DictionaryItemEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default NoticeEntity createNoticeEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new NoticeEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default ProductEntity createProductEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new ProductEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default NoteBookEntity createNoteBookEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new NoteBookEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalAnalysisEntity createCoalAnalysisEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalAnalysisEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default EmployeeEntity createEmployeeEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new EmployeeEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default UserEntity createUserEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new UserEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default SalaryItemEntity createSalaryItemEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new SalaryItemEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default MeterMonthLogEntity createMeterMonthLogEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new MeterMonthLogEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CronJobEntity createCronJobEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CronJobEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default DepartmentEntity createDepartmentEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new DepartmentEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default MeterDayLogEntity createMeterDayLogEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new MeterDayLogEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalAnalysisHisEntity createCoalAnalysisHisEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalAnalysisHisEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default IpListEntity createIpListEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new IpListEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalBlendResultInfoEntity createCoalBlendResultInfoEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalBlendResultInfoEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalBlendEntity createCoalBlendEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalBlendEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default NetDiskEntity createNetDiskEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new NetDiskEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CronJobLogEntity createCronJobLogEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CronJobLogEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default PdfGeneratorEntity createPdfGeneratorEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new PdfGeneratorEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default JobPostEntity createJobPostEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new JobPostEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default DictionaryEntity createDictionaryEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new DictionaryEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default ResetPwdEntity createResetPwdEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new ResetPwdEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default EnterpriseEntity createEnterpriseEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new EnterpriseEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default SysConfigEntity createSysConfigEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new SysConfigEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalParameterDefEntity createCoalParameterDefEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalParameterDefEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CacheCtlEntity createCacheCtlEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CacheCtlEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default PermissionEntity createPermissionEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new PermissionEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default SmsTemplateEntity createSmsTemplateEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new SmsTemplateEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default PurchaseOrderEntity createPurchaseOrderEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new PurchaseOrderEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default SmsEntity createSmsEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new SmsEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default NoticeStatusEntity createNoticeStatusEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new NoticeStatusEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default NoteBookChapterEntity createNoteBookChapterEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new NoteBookChapterEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default DeliveryInformationEntity createDeliveryInformationEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new DeliveryInformationEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default SysLogEntity createSysLogEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new SysLogEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default InventoryCheckEntity createInventoryCheckEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new InventoryCheckEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalWashingDailyAnalysisParamEntity createCoalWashingDailyAnalysisParamEntity(
+            String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalWashingDailyAnalysisParamEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default SupplierEntity createSupplierEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new SupplierEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default ResourceEntity createResourceEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new ResourceEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default MeterEntity createMeterEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new MeterEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default CoalBlendCoalInfoEntity createCoalBlendCoalInfoEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalBlendCoalInfoEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default LoginUserHisEntity createLoginUserHisEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new LoginUserHisEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default LoginUserEntity createLoginUserEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new LoginUserEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default PasswordDictEntity createPasswordDictEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new PasswordDictEntity();
+        e.setId(id);
+        return e;
+    }
+
+    default FileEntity createFileEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new FileEntity();
+        e.setId(id);
+        return e;
+    }
+}

src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java

@@ -2,52 +2,28 @@ package cn.lihongjie.coal.base.mapper;
 
 import cn.lihongjie.coal.base.dto.BaseDto;
 import cn.lihongjie.coal.base.entity.BaseEntity;
-import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity;
-import cn.lihongjie.coal.cronJob.entity.CronJobEntity;
-import cn.lihongjie.coal.cronJobLog.entity.CronJobLogEntity;
-import cn.lihongjie.coal.department.entity.DepartmentEntity;
-import cn.lihongjie.coal.dictionary.entity.DictionaryEntity;
-import cn.lihongjie.coal.dictionary.entity.DictionaryItemEntity;
-import cn.lihongjie.coal.file.entity.FileEntity;
-import cn.lihongjie.coal.inventoryCheck.entity.InventoryCheckEntity;
-import cn.lihongjie.coal.meter.entity.MeterEntity;
-import cn.lihongjie.coal.meterLog.entity.MeterLogEntity;
-import cn.lihongjie.coal.netDisk.entity.NetDiskEntity;
-import cn.lihongjie.coal.noteBook.entity.NoteBookEntity;
-import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity;
-import cn.lihongjie.coal.organization.entity.OrganizationEntity;
-import cn.lihongjie.coal.permission.entity.PermissionEntity;
-import cn.lihongjie.coal.product.entity.ProductEntity;
-import cn.lihongjie.coal.purchaseOrder.entity.PurchaseOrderEntity;
-import cn.lihongjie.coal.resource.entity.ResourceEntity;
-import cn.lihongjie.coal.role.entity.RoleEntity;
-import cn.lihongjie.coal.script.entity.ScriptEntity;
-import cn.lihongjie.coal.supplier.entity.SupplierEntity;
-import cn.lihongjie.coal.syslog.entity.SysLogEntity;
-import cn.lihongjie.coal.user.entity.UserEntity;
 
 import io.hypersistence.utils.hibernate.type.basic.Inet;
 
-import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
 
-@Mapper(componentModel = "spring")
+@Mapper(
+        componentModel = "spring"
+        )
 public interface CommonMapper {
 
-    default Inet stringToInet(String s){
+    default Inet stringToInet(String s) {
         return new Inet(s);
     }
 
-    default Inet inetToInet(Inet s){
+    default Inet inetToInet(Inet s) {
         return new Inet(s.getAddress());
     }
 
-
+    default String inetToString(Inet s) {
-    default String inetToString(Inet s){
         return s.getAddress();
     }
 
-
     default Integer toInt(String s) {
         try {
 
@@ -56,6 +32,7 @@ public interface CommonMapper {
             return null;
         }
     }
+
     default Long toLong(String s) {
         try {
 
@@ -64,251 +41,7 @@ public interface CommonMapper {
             return null;
         }
     }
-    default UserEntity createUser(String id) {
 
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        UserEntity user = new UserEntity();
-
-        user.setId(id);
-
-        return user;
-    }
-
-    default DictionaryEntity createDictionary(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        var e = new DictionaryEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default DictionaryItemEntity createDictionaryItem(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        var e = new DictionaryItemEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default SysLogEntity createOperat(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        var e = new SysLogEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default OrganizationEntity createOrganization(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        var e = new OrganizationEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default PermissionEntity createPermission(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        var e = new PermissionEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default ResourceEntity createResource(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-            return null;
-        }
-        var e = new ResourceEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default RoleEntity createRole(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new RoleEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default ScriptEntity createScript(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new ScriptEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default SupplierEntity createSupplier(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new SupplierEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default CoalInfoEntity createCoalInfo(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new CoalInfoEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default FileEntity createFile(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new FileEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default MeterEntity createMeter(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new MeterEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default MeterLogEntity createMeterLog(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new MeterLogEntity();
-        e.setId(id);
-        return e;
-    }
-    default DepartmentEntity createDepartment(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new DepartmentEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default CronJobEntity createCronJob(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new CronJobEntity();
-        e.setId(id);
-        return e;
-    }
-    default CronJobLogEntity createCronJobLog(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new CronJobLogEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default NoteBookChapterEntity createNoteBookChapter(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new NoteBookChapterEntity();
-        e.setId(id);
-        return e;
-    }
-
-
-    default NetDiskEntity createNetDiskEntity(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new NetDiskEntity();
-        e.setId(id);
-        return e;
-    }
-    default NoteBookEntity createNoteBook(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new NoteBookEntity();
-        e.setId(id);
-        return e;
-    }
-
-
-    default PurchaseOrderEntity createPurchaseOrder(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new PurchaseOrderEntity();
-        e.setId(id);
-        return e;
-    }
-    default InventoryCheckEntity createInventoryCheckEntity(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new InventoryCheckEntity();
-        e.setId(id);
-        return e;
-    }
-
-    default ProductEntity createProductEntity(String id) {
-
-        if (StringUtils.isEmpty(id)) {
-
-            return null;
-        }
-        var e = new ProductEntity();
-        e.setId(id);
-        return e;
-    }
     default String toString(Object o) {
 
         if (o == null) {

src/main/java/cn/lihongjie/coal/cacheCtl/mapper/CacheCtlMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.cacheCtl.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.cacheCtl.dto.CacheCtlDto;
 import cn.lihongjie.coal.cacheCtl.dto.CreateCacheCtlDto;
 import cn.lihongjie.coal.cacheCtl.dto.UpdateCacheCtlDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CacheCtlMapper
         extends BaseMapper<CacheCtlEntity, CacheCtlDto, CreateCacheCtlDto, UpdateCacheCtlDto> {}

src/main/java/cn/lihongjie/coal/coalAnalysis/mapper/CoalAnalysisMapper.java

@@ -1,17 +1,17 @@
 package cn.lihongjie.coal.coalAnalysis.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalAnalysis.dto.CoalAnalysisDto;
 import cn.lihongjie.coal.coalAnalysis.dto.CreateCoalAnalysisDto;
 import cn.lihongjie.coal.coalAnalysis.dto.UpdateCoalAnalysisDto;
 import cn.lihongjie.coal.coalAnalysis.entity.CoalAnalysisEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CoalAnalysisMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/coalAnalysisHis/mapper/CoalAnalysisHisMapper.java

@@ -1,12 +1,12 @@
 package cn.lihongjie.coal.coalAnalysisHis.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalAnalysis.entity.CoalAnalysisEntity;
 import cn.lihongjie.coal.coalAnalysisHis.dto.CoalAnalysisHisDto;
 import cn.lihongjie.coal.coalAnalysisHis.dto.CreateCoalAnalysisHisDto;
 import cn.lihongjie.coal.coalAnalysisHis.dto.UpdateCoalAnalysisHisDto;
 import cn.lihongjie.coal.coalAnalysisHis.entity.CoalAnalysisHisEntity;
+
 import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
@@ -14,7 +14,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface CoalAnalysisHisMapper extends BaseMapper<CoalAnalysisHisEntity, CoalAnalysisHisDto, CreateCoalAnalysisHisDto, UpdateCoalAnalysisHisDto> {

src/main/java/cn/lihongjie/coal/coalBlend/mapper/CoalBlendMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.coalBlend.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalBlend.dto.CoalBlendDto;
 import cn.lihongjie.coal.coalBlend.dto.CreateCoalBlendDto;
 import cn.lihongjie.coal.coalBlend.dto.UpdateCoalBlendDto;
@@ -16,7 +15,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CoalBlendMapper
         extends BaseMapper<CoalBlendEntity, CoalBlendDto, CreateCoalBlendDto, UpdateCoalBlendDto> {

src/main/java/cn/lihongjie/coal/coalInfo/mapper/CoalInfoMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.coalInfo.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalInfo.dto.CoalInfoDto;
 import cn.lihongjie.coal.coalInfo.dto.CreateCoalInfoDto;
 import cn.lihongjie.coal.coalInfo.dto.UpdateCoalInfoDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CoalInfoMapper
         extends BaseMapper<CoalInfoEntity, CoalInfoDto, CreateCoalInfoDto, UpdateCoalInfoDto> {

src/main/java/cn/lihongjie/coal/coalParameterDef/mapper/CoalParameterDefMapper.java

@@ -1,18 +1,18 @@
 package cn.lihongjie.coal.coalParameterDef.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalParameterDef.dto.CoalParameterDefDto;
 import cn.lihongjie.coal.coalParameterDef.dto.CreateCoalParameterDefDto;
 import cn.lihongjie.coal.coalParameterDef.dto.UpdateCoalParameterDefDto;
 import cn.lihongjie.coal.coalParameterDef.entity.CoalParameterDefEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CoalParameterDefMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/coalPrice/mapper/CoalPriceMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.coalPrice.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalPrice.dto.CoalPriceDto;
 import cn.lihongjie.coal.coalPrice.dto.CreateCoalPriceDto;
 import cn.lihongjie.coal.coalPrice.dto.UpdateCoalPriceDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CoalPriceMapper
         extends BaseMapper<CoalPriceEntity, CoalPriceDto, CreateCoalPriceDto, UpdateCoalPriceDto> {}

src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/mapper/CoalWashingDailyAnalysisMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.coalWashingDailyAnalysis.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalWashingDailyAnalysis.dto.CoalWashingDailyAnalysisDto;
 import cn.lihongjie.coal.coalWashingDailyAnalysis.dto.CreateCoalWashingDailyAnalysisDto;
 import cn.lihongjie.coal.coalWashingDailyAnalysis.dto.UpdateCoalWashingDailyAnalysisDto;
@@ -13,7 +12,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface CoalWashingDailyAnalysisMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/mapper/RoundMapper.java

@@ -1,6 +1,5 @@
 package cn.lihongjie.coal.coalWashingDailyAnalysis.mapper;
 
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalBlend.dto.CoalBlendDto;
 import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisEntity;
 import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo;
@@ -15,7 +14,7 @@ import java.math.RoundingMode;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface RoundMapper {
 

src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysisParam/mapper/CoalWashingDailyAnalysisParamMapper.java

@@ -1,17 +1,17 @@
 package cn.lihongjie.coal.coalWashingDailyAnalysisParam.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.coalWashingDailyAnalysisParam.dto.CoalWashingDailyAnalysisParamDto;
 import cn.lihongjie.coal.coalWashingDailyAnalysisParam.dto.CreateCoalWashingDailyAnalysisParamDto;
 import cn.lihongjie.coal.coalWashingDailyAnalysisParam.dto.UpdateCoalWashingDailyAnalysisParamDto;
 import cn.lihongjie.coal.coalWashingDailyAnalysisParam.entity.CoalWashingDailyAnalysisParamEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface CoalWashingDailyAnalysisParamMapper extends BaseMapper<CoalWashingDailyAnalysisParamEntity, CoalWashingDailyAnalysisParamDto, CreateCoalWashingDailyAnalysisParamDto, UpdateCoalWashingDailyAnalysisParamDto> {

src/main/java/cn/lihongjie/coal/cronJob/mapper/CronJobMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.cronJob.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.cronJob.dto.CreateCronJobDto;
 import cn.lihongjie.coal.cronJob.dto.CronJobDto;
 import cn.lihongjie.coal.cronJob.dto.UpdateCronJobDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface CronJobMapper extends BaseMapper<CronJobEntity, CronJobDto, CreateCronJobDto, UpdateCronJobDto> {

src/main/java/cn/lihongjie/coal/cronJobLog/mapper/CronJobLogMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.cronJobLog.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.cronJobLog.dto.CreateCronJobLogDto;
 import cn.lihongjie.coal.cronJobLog.dto.CronJobLogDto;
 import cn.lihongjie.coal.cronJobLog.dto.UpdateCronJobLogDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface CronJobLogMapper extends BaseMapper<CronJobLogEntity, CronJobLogDto, CreateCronJobLogDto, UpdateCronJobLogDto> {

src/main/java/cn/lihongjie/coal/deliveryInformation/mapper/DeliveryInformationMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.deliveryInformation.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.deliveryInformation.dto.CreateDeliveryInformationDto;
 import cn.lihongjie.coal.deliveryInformation.dto.DeliveryInformationDto;
 import cn.lihongjie.coal.deliveryInformation.dto.UpdateDeliveryInformationDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface DeliveryInformationMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/department/mapper/DepartmentMapper.java

@@ -1,18 +1,18 @@
 package cn.lihongjie.coal.department.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.department.dto.CreateDepartmentDto;
 import cn.lihongjie.coal.department.dto.DepartmentDto;
 import cn.lihongjie.coal.department.dto.UpdateDepartmentDto;
 import cn.lihongjie.coal.department.entity.DepartmentEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface DepartmentMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryItemMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.dictionary.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.dictionary.dto.CreateDictionaryItemDto;
 import cn.lihongjie.coal.dictionary.dto.DictionaryItemDto;
 import cn.lihongjie.coal.dictionary.dto.UpdateDictionaryItemDto;
@@ -12,7 +11,7 @@ import org.mapstruct.MappingConstants;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class})
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class})
 public interface DictionaryItemMapper
         extends BaseMapper<
                 DictionaryItemEntity,

src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.dictionary.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.dictionary.dto.*;
 import cn.lihongjie.coal.dictionary.entity.DictionaryEntity;
 
@@ -11,7 +10,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface DictionaryMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/downloadCenter/mapper/DownloadCenterMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.downloadCenter.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.downloadCenter.dto.CreateDownloadCenterDto;
 import cn.lihongjie.coal.downloadCenter.dto.DownloadCenterDto;
 import cn.lihongjie.coal.downloadCenter.dto.UpdateDownloadCenterDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface DownloadCenterMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/employee/mapper/EmployeeMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.employee.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.employee.dto.CreateEmployeeDto;
 import cn.lihongjie.coal.employee.dto.EmployeeDto;
 import cn.lihongjie.coal.employee.dto.UpdateEmployeeDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface EmployeeMapper
         extends BaseMapper<EmployeeEntity, EmployeeDto, CreateEmployeeDto, UpdateEmployeeDto> {}

src/main/java/cn/lihongjie/coal/enterprise/mapper/EnterpriseMapper.java

@@ -1,17 +1,17 @@
 package cn.lihongjie.coal.enterprise.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.enterprise.dto.CreateEnterpriseDto;
 import cn.lihongjie.coal.enterprise.dto.EnterpriseDto;
 import cn.lihongjie.coal.enterprise.dto.UpdateEnterpriseDto;
 import cn.lihongjie.coal.enterprise.entity.EnterpriseEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface EnterpriseMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/file/mapper/FileMapper.java

@@ -1,16 +1,16 @@
 package cn.lihongjie.coal.file.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.file.dto.CreateFileDto;
 import cn.lihongjie.coal.file.dto.FileDto;
 import cn.lihongjie.coal.file.dto.UpdateFileDto;
 import cn.lihongjie.coal.file.entity.FileEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface FileMapper extends BaseMapper<FileEntity, FileDto, CreateFileDto, UpdateFileDto> {}

src/main/java/cn/lihongjie/coal/inventoryCheck/mapper/InventoryCheckMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.inventoryCheck.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.inventoryCheck.dto.CreateInventoryCheckDto;
 import cn.lihongjie.coal.inventoryCheck.dto.InventoryCheckDto;
 import cn.lihongjie.coal.inventoryCheck.dto.UpdateInventoryCheckDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface InventoryCheckMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/inventoryCheckDetail/mapper/InventoryCheckDetailMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.inventoryCheckDetail.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.inventoryCheckDetail.dto.CreateInventoryCheckDetailDto;
 import cn.lihongjie.coal.inventoryCheckDetail.dto.InventoryCheckDetailDto;
 import cn.lihongjie.coal.inventoryCheckDetail.dto.UpdateInventoryCheckDetailDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface InventoryCheckDetailMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/ipList/mapper/IpListMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.ipList.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.ipList.dto.CreateIpListDto;
 import cn.lihongjie.coal.ipList.dto.IpListDto;
 import cn.lihongjie.coal.ipList.dto.UpdateIpListDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface IpListMapper
         extends BaseMapper<IpListEntity, IpListDto, CreateIpListDto, UpdateIpListDto> {}

src/main/java/cn/lihongjie/coal/jobPost/mapper/JobPostMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.jobPost.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.jobPost.dto.CreateJobPostDto;
 import cn.lihongjie.coal.jobPost.dto.JobPostDto;
 import cn.lihongjie.coal.jobPost.dto.UpdateJobPostDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface JobPostMapper
         extends BaseMapper<JobPostEntity, JobPostDto, CreateJobPostDto, UpdateJobPostDto> {}

src/main/java/cn/lihongjie/coal/loginUser/mapper/LoginUserMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.loginUser.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.loginUser.dto.CreateLoginUserDto;
 import cn.lihongjie.coal.loginUser.dto.LoginUserDto;
 import cn.lihongjie.coal.loginUser.dto.UpdateLoginUserDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface LoginUserMapper
         extends BaseMapper<LoginUserEntity, LoginUserDto, CreateLoginUserDto, UpdateLoginUserDto> {}

src/main/java/cn/lihongjie/coal/loginUserHis/mapper/LoginUserHisMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.loginUserHis.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.loginUserHis.dto.CreateLoginUserHisDto;
 import cn.lihongjie.coal.loginUserHis.dto.LoginUserHisDto;
 import cn.lihongjie.coal.loginUserHis.dto.UpdateLoginUserHisDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface LoginUserHisMapper extends BaseMapper<LoginUserHisEntity, LoginUserHisDto, CreateLoginUserHisDto, UpdateLoginUserHisDto> {

src/main/java/cn/lihongjie/coal/meter/mapper/MeterMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.meter.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.meter.dto.CreateMeterDto;
 import cn.lihongjie.coal.meter.dto.MeterDto;
 import cn.lihongjie.coal.meter.dto.UpdateMeterDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface MeterMapper
         extends BaseMapper<MeterEntity, MeterDto, CreateMeterDto, UpdateMeterDto> {}

src/main/java/cn/lihongjie/coal/meterDayLog/mapper/MeterDayLogMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.meterDayLog.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.meterDayLog.dto.CreateMeterDayLogDto;
 import cn.lihongjie.coal.meterDayLog.dto.MeterDayLogDto;
 import cn.lihongjie.coal.meterDayLog.dto.UpdateMeterDayLogDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface MeterDayLogMapper extends BaseMapper<MeterDayLogEntity, MeterDayLogDto, CreateMeterDayLogDto, UpdateMeterDayLogDto> {

src/main/java/cn/lihongjie/coal/meterLog/mapper/MeterLogMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.meterLog.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.meterLog.dto.CreateMeterLogDto;
 import cn.lihongjie.coal.meterLog.dto.MeterLogDto;
 import cn.lihongjie.coal.meterLog.dto.UpdateMeterLogDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface MeterLogMapper
         extends BaseMapper<MeterLogEntity, MeterLogDto, CreateMeterLogDto, UpdateMeterLogDto> {}

src/main/java/cn/lihongjie/coal/meterMonthLog/mapper/MeterMonthLogMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.meterMonthLog.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.meterMonthLog.dto.CreateMeterMonthLogDto;
 import cn.lihongjie.coal.meterMonthLog.dto.MeterMonthLogDto;
 import cn.lihongjie.coal.meterMonthLog.dto.UpdateMeterMonthLogDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface MeterMonthLogMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/netDisk/mapper/NetDiskMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.netDisk.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.netDisk.dto.*;
 import cn.lihongjie.coal.netDisk.entity.NetDiskEntity;
 
@@ -15,7 +14,7 @@ import java.util.List;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface NetDiskMapper
         extends BaseMapper<NetDiskEntity, NetDiskDto, CreateNetDiskDto, UpdateNetDiskDto> {

src/main/java/cn/lihongjie/coal/noteBook/mapper/NoteBookMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.noteBook.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.noteBook.dto.CreateNoteBookDto;
 import cn.lihongjie.coal.noteBook.dto.NoteBookDto;
 import cn.lihongjie.coal.noteBook.dto.UpdateNoteBookDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface NoteBookMapper extends BaseMapper<NoteBookEntity, NoteBookDto, CreateNoteBookDto, UpdateNoteBookDto> {

src/main/java/cn/lihongjie/coal/noteBookChapter/mapper/NoteBookChapterMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.noteBookChapter.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.noteBookChapter.dto.CreateNoteBookChapterDto;
 import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterDto;
 import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterTreeDto;
@@ -13,7 +12,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface NoteBookChapterMapper extends BaseMapper<NoteBookChapterEntity, NoteBookChapterDto, CreateNoteBookChapterDto, UpdateNoteBookChapterDto> {

src/main/java/cn/lihongjie/coal/notice/mapper/NoticeMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.notice.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.notice.dto.CreateNoticeDto;
 import cn.lihongjie.coal.notice.dto.NoticeDto;
 import cn.lihongjie.coal.notice.dto.UpdateNoticeDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface NoticeMapper extends BaseMapper<NoticeEntity, NoticeDto, CreateNoticeDto, UpdateNoticeDto> {

src/main/java/cn/lihongjie/coal/noticeStatus/mapper/NoticeStatusMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.noticeStatus.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.noticeStatus.dto.CreateNoticeStatusDto;
 import cn.lihongjie.coal.noticeStatus.dto.NoticeStatusDto;
 import cn.lihongjie.coal.noticeStatus.dto.UpdateNoticeStatusDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface NoticeStatusMapper extends BaseMapper<NoticeStatusEntity, NoticeStatusDto, CreateNoticeStatusDto, UpdateNoticeStatusDto> {

src/main/java/cn/lihongjie/coal/organization/mapper/OrganizationMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.organization.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.organization.dto.CreateOrganizationDto;
 import cn.lihongjie.coal.organization.dto.OrganizationDto;
 import cn.lihongjie.coal.organization.dto.UpdateOrganizationDto;
@@ -13,7 +12,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface OrganizationMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/passwordDict/mapper/PasswordDictMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.passwordDict.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.passwordDict.dto.CreatePasswordDictDto;
 import cn.lihongjie.coal.passwordDict.dto.PasswordDictDto;
 import cn.lihongjie.coal.passwordDict.dto.UpdatePasswordDictDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface PasswordDictMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/pdfGenerator/mapper/PdfGeneratorMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.pdfGenerator.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.pdfGenerator.dto.CreatePdfGeneratorDto;
 import cn.lihongjie.coal.pdfGenerator.dto.GeneratePdfDto;
 import cn.lihongjie.coal.pdfGenerator.dto.PdfGeneratorDto;
@@ -13,7 +12,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface PdfGeneratorMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/permission/mapper/PermissionMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.permission.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.permission.dto.*;
 import cn.lihongjie.coal.permission.entity.PermissionEntity;
 
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface PermissionMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/product/mapper/ProductMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.product.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.product.dto.CreateProductDto;
 import cn.lihongjie.coal.product.dto.ProductDto;
 import cn.lihongjie.coal.product.dto.UpdateProductDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface ProductMapper
         extends BaseMapper<ProductEntity, ProductDto, CreateProductDto, UpdateProductDto> {}

src/main/java/cn/lihongjie/coal/purchaseOrder/mapper/PurchaseOrderMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.purchaseOrder.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.purchaseOrder.dto.CreatePurchaseOrderDto;
 import cn.lihongjie.coal.purchaseOrder.dto.PurchaseOrderDto;
 import cn.lihongjie.coal.purchaseOrder.dto.UpdatePurchaseOrderDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface PurchaseOrderMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/resetPwd/mapper/ResetPwdMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.resetPwd.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.resetPwd.dto.CreateResetPwdDto;
 import cn.lihongjie.coal.resetPwd.dto.ResetPwdDto;
 import cn.lihongjie.coal.resetPwd.dto.UpdateResetPwdDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
     componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-    uses = {CommonMapper.class},
+    uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
     mappingControl = DeepClone.class
 )
 public interface ResetPwdMapper extends BaseMapper<ResetPwdEntity, ResetPwdDto, CreateResetPwdDto, UpdateResetPwdDto> {

src/main/java/cn/lihongjie/coal/resource/mapper/ResourceMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.resource.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.resource.dto.CreateResourceDto;
 import cn.lihongjie.coal.resource.dto.ResourceDto;
 import cn.lihongjie.coal.resource.dto.ResourceTreeDto;
@@ -18,7 +17,7 @@ import java.util.List;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface ResourceMapper
         extends BaseMapper<ResourceEntity, ResourceDto, CreateResourceDto, UpdateResourceDto> {

src/main/java/cn/lihongjie/coal/role/mapper/RoleMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.role.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.role.dto.CreateRoleDto;
 import cn.lihongjie.coal.role.dto.RoleDto;
 import cn.lihongjie.coal.role.dto.UpdateRoleDto;
@@ -13,6 +12,6 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface RoleMapper extends BaseMapper<RoleEntity, RoleDto, CreateRoleDto, UpdateRoleDto> {}

src/main/java/cn/lihongjie/coal/salaryItem/mapper/SalaryItemMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.salaryItem.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.salaryItem.dto.CreateSalaryItemDto;
 import cn.lihongjie.coal.salaryItem.dto.SalaryItemDto;
 import cn.lihongjie.coal.salaryItem.dto.UpdateSalaryItemDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface SalaryItemMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/script/mapper/ScriptMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.script.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.script.dto.CreateScriptDto;
 import cn.lihongjie.coal.script.dto.ScriptDto;
 import cn.lihongjie.coal.script.dto.UpdateScriptDto;
@@ -12,6 +11,6 @@ import org.mapstruct.MappingConstants;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class})
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class})
 public interface ScriptMapper
         extends BaseMapper<ScriptEntity, ScriptDto, CreateScriptDto, UpdateScriptDto> {}

src/main/java/cn/lihongjie/coal/sms/mapper/SmsMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.sms.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.sms.dto.CreateSmsDto;
 import cn.lihongjie.coal.sms.dto.SmsDto;
 import cn.lihongjie.coal.sms.dto.UpdateSmsDto;
@@ -12,6 +11,6 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface SmsMapper extends BaseMapper<SmsEntity, SmsDto, CreateSmsDto, UpdateSmsDto> {}

src/main/java/cn/lihongjie/coal/smsTemplate/mapper/SmsTemplateMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.smsTemplate.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.smsTemplate.dto.CreateSmsTemplateDto;
 import cn.lihongjie.coal.smsTemplate.dto.SmsTemplateDto;
 import cn.lihongjie.coal.smsTemplate.dto.UpdateSmsTemplateDto;
@@ -12,7 +11,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface SmsTemplateMapper
         extends BaseMapper<

src/main/java/cn/lihongjie/coal/supplier/mapper/SupplierMapper.java

@@ -3,7 +3,6 @@ package cn.lihongjie.coal.supplier.mapper;
 import static org.mapstruct.MappingConstants.ComponentModel.SPRING;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.supplier.dto.CreateSupplierDto;
 import cn.lihongjie.coal.supplier.dto.SupplierDto;
 import cn.lihongjie.coal.supplier.dto.UpdateSupplierDto;
@@ -14,7 +13,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface SupplierMapper
         extends BaseMapper<SupplierEntity, SupplierDto, CreateSupplierDto, UpdateSupplierDto> {}

src/main/java/cn/lihongjie/coal/sysconfig/mapper/SysConfigMapper.java

@@ -1,18 +1,18 @@
 package cn.lihongjie.coal.sysconfig.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.sysconfig.dto.CreateSysConfigDto;
 import cn.lihongjie.coal.sysconfig.dto.SysConfigDto;
 import cn.lihongjie.coal.sysconfig.dto.UpdateSysConfigDto;
 import cn.lihongjie.coal.sysconfig.entity.SysConfigEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface SysConfigMapper
         extends BaseMapper<SysConfigEntity, SysConfigDto, CreateSysConfigDto, UpdateSysConfigDto> {}

src/main/java/cn/lihongjie/coal/syslog/mapper/SysLogMapper.java

@@ -1,18 +1,18 @@
 package cn.lihongjie.coal.syslog.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.syslog.dto.CreateSysLogDto;
 import cn.lihongjie.coal.syslog.dto.SysLogDto;
 import cn.lihongjie.coal.syslog.dto.UpdateSysLogDto;
 import cn.lihongjie.coal.syslog.entity.SysLogEntity;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface SysLogMapper
         extends BaseMapper<SysLogEntity, SysLogDto, CreateSysLogDto, UpdateSysLogDto> {}

src/main/java/cn/lihongjie/coal/user/mapper/UserMapper.java

@@ -1,7 +1,6 @@
 package cn.lihongjie.coal.user.mapper;
 
 import cn.lihongjie.coal.base.mapper.BaseMapper;
-import cn.lihongjie.coal.base.mapper.CommonMapper;
 import cn.lihongjie.coal.user.dto.CreateOrgAdminDto;
 import cn.lihongjie.coal.user.dto.CreateUserDto;
 import cn.lihongjie.coal.user.dto.UpdateUserDto;
@@ -14,7 +13,7 @@ import org.mapstruct.control.DeepClone;
 
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
-        uses = {CommonMapper.class},
+        uses = {cn.lihongjie.coal.base.mapper.CommonMapper.class, cn.lihongjie.coal.base.mapper.CommonEntityMapper.class},
         mappingControl = DeepClone.class)
 public interface UserMapper extends BaseMapper<UserEntity, UserDto, CreateUserDto, UpdateUserDto> {
     UserEntity toEntity(CreateOrgAdminDto request);