diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
similarity index 90%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
index 16d9d93..a9bedf3 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
@@ -1,21 +1,15 @@
-package com.thing.cqc.CqcCarbonConsumables.controller;
+package com.thing.cqc.cqcCarbonConsumables.controller;
 
 import com.thing.common.core.annotation.LogOperation;
-import com.thing.common.core.constants.Constant;
 import com.thing.common.core.validator.AssertUtils;
 import com.thing.common.core.validator.ValidatorUtils;
 import com.thing.common.core.validator.group.AddGroup;
 import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
-import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
-import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
-
-import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
+import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
+import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
index 4c7448f..200a4c5 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
@@ -1,7 +1,6 @@
-package com.thing.cqc.CqcCarbonConsumables.dto;
+package com.thing.cqc.cqcCarbonConsumables.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 
 import java.io.Serial;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
index 8f3d81e..5990ef9 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
@@ -1,8 +1,7 @@
-package com.thing.cqc.CqcCarbonConsumables.entity;
+package com.thing.cqc.cqcCarbonConsumables.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
similarity index 71%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
index 1b27ac9..4ee39c9 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonConsumables.mapper;
+package com.thing.cqc.cqcCarbonConsumables.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java
similarity index 67%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java
index a59ff6b..80c6860 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonConsumables.service;
+package com.thing.cqc.cqcCarbonConsumables.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
 
 /**
  * 使用阶段耗材信息
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
similarity index 74%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
index 37ab7c2..6371a95 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
@@ -1,11 +1,10 @@
-package com.thing.cqc.CqcCarbonConsumables.service.impl;
+package com.thing.cqc.cqcCarbonConsumables.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper;
-import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
-import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import com.thing.cqc.cqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper;
+import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java
similarity index 95%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java
index 52af7b0..baed0c3 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonDiscard.controller;
+package com.thing.cqc.cqcCarbonDiscard.controller;
 
 import com.thing.common.core.annotation.LogOperation;
 import com.thing.common.core.constants.Constant;
@@ -9,9 +9,8 @@ import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
 import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
-import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
-
+import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
+import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
index 9027ac7..0777019 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
@@ -1,7 +1,6 @@
-package com.thing.cqc.CqcCarbonDiscard.dto;
+package com.thing.cqc.cqcCarbonDiscard.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 
 import java.io.Serial;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
index 82e0dc9..d3b0193 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonDiscard.entity;
+package com.thing.cqc.cqcCarbonDiscard.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
similarity index 71%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
index 740834f..16d0f92 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonDiscard.mapper;
+package com.thing.cqc.cqcCarbonDiscard.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java
similarity index 67%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java
index ebf4d7b..0993aaf 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonDiscard.service;
+package com.thing.cqc.cqcCarbonDiscard.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
 
 /**
  * 废物处置及再利用信息
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
similarity index 70%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
index 9436f08..bd85ec7 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
@@ -1,10 +1,10 @@
-package com.thing.cqc.CqcCarbonDiscard.service.impl;
+package com.thing.cqc.cqcCarbonDiscard.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper;
-import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
-import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
+import com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper;
+import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java
similarity index 90%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java
index bae4155..ed81e9e 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java
@@ -1,21 +1,15 @@
-package com.thing.cqc.CqcCarbonDistribution.controller;
+package com.thing.cqc.cqcCarbonDistribution.controller;
 
 import com.thing.common.core.annotation.LogOperation;
-import com.thing.common.core.constants.Constant;
 import com.thing.common.core.validator.AssertUtils;
 import com.thing.common.core.validator.ValidatorUtils;
 import com.thing.common.core.validator.group.AddGroup;
 import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
-import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
-import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
-
-import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
+import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
+import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
index 5353eae..57116a1 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
@@ -1,7 +1,6 @@
-package com.thing.cqc.CqcCarbonDistribution.dto;
+package com.thing.cqc.cqcCarbonDistribution.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 
 import java.io.Serial;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
similarity index 96%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
index 6441b5f..926d7a5 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
@@ -1,8 +1,7 @@
-package com.thing.cqc.CqcCarbonDistribution.entity;
+package com.thing.cqc.cqcCarbonDistribution.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
similarity index 71%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
index 55a7270..fd42454 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonDistribution.mapper;
+package com.thing.cqc.cqcCarbonDistribution.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java
similarity index 66%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java
index f11db4b..ab7ad20 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonDistribution.service;
+package com.thing.cqc.cqcCarbonDistribution.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
 
 /**
  * 产品分销信息
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
similarity index 74%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
index 8b00ddf..e083b4e 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
@@ -1,11 +1,10 @@
-package com.thing.cqc.CqcCarbonDistribution.service.impl;
+package com.thing.cqc.cqcCarbonDistribution.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper;
-import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
-import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import com.thing.cqc.cqcCarbonDistribution.mapper.CqcCarbonDistributionMapper;
+import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java
similarity index 89%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java
index 4cb3f1a..b8b993b 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java
@@ -1,21 +1,16 @@
-package com.thing.cqc.CqcCarbonEnergy.controller;
+package com.thing.cqc.cqcCarbonEnergy.controller;
 
 import com.thing.common.core.annotation.LogOperation;
-import com.thing.common.core.constants.Constant;
 import com.thing.common.core.validator.AssertUtils;
 import com.thing.common.core.validator.ValidatorUtils;
 import com.thing.common.core.validator.group.AddGroup;
 import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
-import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
-import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
+import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
+import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService;
 
-import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
index be1d4fc..9b73dc0 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonEnergy.dto;
+package com.thing.cqc.cqcCarbonEnergy.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
similarity index 96%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
index c9d8339..4803121 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonEnergy.entity;
+package com.thing.cqc.cqcCarbonEnergy.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
similarity index 71%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
index 9bc4363..d8b5627 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonEnergy.mapper;
+package com.thing.cqc.cqcCarbonEnergy.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java
similarity index 66%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java
index c8550d5..8f2da2e 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonEnergy.service;
+package com.thing.cqc.cqcCarbonEnergy.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
 
 /**
  *  使用阶段能源信息
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
similarity index 73%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
index 750630e..27b87ef 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
@@ -1,11 +1,10 @@
-package com.thing.cqc.CqcCarbonEnergy.service.impl;
+package com.thing.cqc.cqcCarbonEnergy.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper;
-import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
-import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonEnergy.mapper.CqcCarbonEnergyMapper;
+import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java
similarity index 89%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java
index 3913c2c..27627a8 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java
@@ -1,21 +1,16 @@
-package com.thing.cqc.CqcCarbonMake.controller;
+package com.thing.cqc.cqcCarbonMake.controller;
 
 import com.thing.common.core.annotation.LogOperation;
-import com.thing.common.core.constants.Constant;
 import com.thing.common.core.validator.AssertUtils;
 import com.thing.common.core.validator.ValidatorUtils;
 import com.thing.common.core.validator.group.AddGroup;
 import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
-import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO;
-import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
+import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO;
+import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService;
 
-import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java
index b0206ce..2da0c61 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonMake.dto;
+package com.thing.cqc.cqcCarbonMake.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java
similarity index 96%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java
index 33758da..5cba885 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonMake.entity;
+package com.thing.cqc.cqcCarbonMake.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java
similarity index 71%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java
index 5fef182..02d407b 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonMake.mapper;
+package com.thing.cqc.cqcCarbonMake.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java
similarity index 66%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java
index 2bb4955..88da54e 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonMake.service;
+package com.thing.cqc.cqcCarbonMake.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
 
 /**
  * 制造阶段能源消耗信息
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
similarity index 73%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
index 93b3980..79e02c9 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
@@ -1,11 +1,10 @@
-package com.thing.cqc.CqcCarbonMake.service.impl;
+package com.thing.cqc.cqcCarbonMake.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper;
-import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
-import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonMake.mapper.CqcCarbonMakeMapper;
+import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
+import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java
similarity index 91%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java
index 92a18ef..9fd8640 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java
@@ -1,19 +1,15 @@
-package com.thing.cqc.CqcCarbonRaw.controller;
+package com.thing.cqc.cqcCarbonRaw.controller;
 
 import com.thing.common.core.annotation.LogOperation;
-import com.thing.common.core.constants.Constant;
 import com.thing.common.core.validator.AssertUtils;
 import com.thing.common.core.validator.ValidatorUtils;
 import com.thing.common.core.validator.group.AddGroup;
 import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
-import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
-import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
+import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO;
+import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java
similarity index 98%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java
index 49023f4..ad39a80 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonRaw.dto;
+package com.thing.cqc.cqcCarbonRaw.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java
similarity index 97%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java
index f5f79e5..c8bf0b6 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonRaw.entity;
+package com.thing.cqc.cqcCarbonRaw.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java
similarity index 71%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java
index 922d3cb..966eff6 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonRaw.mapper;
+package com.thing.cqc.cqcCarbonRaw.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java
similarity index 66%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java
index 196a81d..ab3a822 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonRaw.service;
+package com.thing.cqc.cqcCarbonRaw.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity;
 
 /**
  * 原物料阶段数据
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
similarity index 77%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
index fc0ffa1..219940c 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
@@ -1,10 +1,10 @@
-package com.thing.cqc.CqcCarbonRaw.service.impl;
+package com.thing.cqc.cqcCarbonRaw.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
-import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper;
-import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
+import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.cqcCarbonRaw.mapper.CqcCarbonRawMapper;
+import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java
similarity index 95%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java
index 2d0a2f6..4012628 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonReport.controller;
+package com.thing.cqc.cqcCarbonReport.controller;
 
 import com.thing.common.core.annotation.LogOperation;
 import com.thing.common.core.constants.Constant;
@@ -9,9 +9,8 @@ import com.thing.common.core.validator.group.DefaultGroup;
 import com.thing.common.core.validator.group.UpdateGroup;
 import com.thing.common.core.web.response.PageData;
 import com.thing.common.core.web.response.Result;
-import com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO;
-import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
-
+import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportDTO;
+import com.thing.cqc.cqcCarbonReport.service.CqcCarbonReportService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java
similarity index 99%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java
index 5869011..7a8f0ca 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java
@@ -1,4 +1,4 @@
-package com.thing.cqc.CqcCarbonReport.dto;
+package com.thing.cqc.cqcCarbonReport.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java
similarity index 98%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java
index 2045339..d4ac751 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java
@@ -1,8 +1,7 @@
-package com.thing.cqc.CqcCarbonReport.entity;
+package com.thing.cqc.cqcCarbonReport.entity;
 
 import com.mybatisflex.annotation.Table;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
similarity index 70%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
index 4fe6c55..d8b8011 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonReport.mapper;
+package com.thing.cqc.cqcCarbonReport.mapper;
 
 import com.thing.common.orm.mapper.PowerBaseMapper;
-import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java
similarity index 66%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java
index 157d1b2..9572e05 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java
@@ -1,7 +1,7 @@
-package com.thing.cqc.CqcCarbonReport.service;
+package com.thing.cqc.cqcCarbonReport.service;
 
 import com.thing.common.orm.service.IBaseService;
-import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
 
 /**
  * 申请表基础数据
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
similarity index 76%
rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
index 85b2349..f8753e2 100644
--- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
@@ -1,10 +1,10 @@
-package com.thing.cqc.CqcCarbonReport.service.impl;
+package com.thing.cqc.cqcCarbonReport.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
-import com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper;
-import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
-import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
+import com.thing.cqc.cqcCarbonReport.mapper.CqcCarbonReportMapper;
+import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
+import com.thing.cqc.cqcCarbonReport.service.CqcCarbonReportService;
 import com.thing.sys.security.context.UserContext;
 import org.springframework.stereotype.Service;
 
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java
new file mode 100644
index 0000000..5d26c52
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.rpcService;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.Base64;
+
+public class JsonCryptoUtils {
+
+    private static final String ALGORITHM = "AES";
+    private static final String SECRETKEY = "6276a411ba4fec23"; // 16 characters key for AES
+
+    public static String encryptJson(String jsonString, String secretKey) throws Exception {
+        SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), ALGORITHM);
+        Cipher cipher = Cipher.getInstance(ALGORITHM);
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec);
+        byte[] encryptedBytes = cipher.doFinal(jsonString.getBytes());
+        return Base64.getEncoder().encodeToString(encryptedBytes);
+    }
+
+    public static String decryptJson(String encryptedJsonString, String secretKey) throws Exception {
+        SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), ALGORITHM);
+        Cipher cipher = Cipher.getInstance(ALGORITHM);
+        cipher.init(Cipher.DECRYPT_MODE, keySpec);
+        byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedJsonString));
+        return new String(decryptedBytes);
+    }
+
+}
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java
new file mode 100644
index 0000000..81b377c
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java
@@ -0,0 +1,11 @@
+package com.thing.cqc.rpcService.service;
+
+public interface CqcRpcService {
+
+
+
+
+
+
+    public String doUploadData();
+}
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java
new file mode 100644
index 0000000..2cadbcf
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java
@@ -0,0 +1,19 @@
+package com.thing.cqc.rpcService.service.impl;
+
+import com.thing.cqc.rpcService.service.CqcRpcService;
+import com.thing.sys.biz.utils.HttpClientUtil;
+
+public class CqcRpcServiceImpl implements CqcRpcService {
+
+
+
+
+
+
+    @Override
+    public String doUploadData() {
+        //数据加密
+
+        return null;
+    }
+}
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml
deleted file mode 100644
index bb08a24..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity" id="cqcCarbonConsumablesMap">
-        <result property="id" column="id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="cateid" column="cateid"/>
-        <result property="materialsnamecn" column="materialsnamecn"/>
-        <result property="materialsnameen" column="materialsnameen"/>
-        <result property="materialsuse" column="materialsuse"/>
-        <result property="materialcomponent" column="materialcomponent"/>
-        <result property="productcapacity" column="productcapacity"/>
-        <result property="productcapacityunit" column="productcapacityunit"/>
-        <result property="rawmaterialsinput" column="rawmaterialsinput"/>
-        <result property="rawmaterialsunit" column="rawmaterialsunit"/>
-        <result property="suppliername" column="suppliername"/>
-        <result property="supplieraddress" column="supplieraddress"/>
-        <result property="transmode" column="transmode"/>
-        <result property="transloadcapacity" column="transloadcapacity"/>
-        <result property="transdistance" column="transdistance"/>
-        <result property="transdistanceunit" column="transdistanceunit"/>
-        <result property="transdatasource" column="transdatasource"/>
-        <result property="activitydatasource" column="activitydatasource"/>
-        <result property="dept" column="dept"/>
-        <result property="person" column="person"/>
-        <result property="phone" column="phone"/>
-        <result property="remake" column="remake"/>
-        <result property="energyno" column="energyno"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml
new file mode 100644
index 0000000..3c269af
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml
deleted file mode 100644
index bdb6f7e..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity" id="cqcCarbonDiscardMap">
-        <result property="id" column="id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="cateid" column="cateid"/>
-        <result property="materialsnamecn" column="materialsnamecn"/>
-        <result property="materialsnameen" column="materialsnameen"/>
-        <result property="materialcomponent" column="materialcomponent"/>
-        <result property="wastedisposal" column="wastedisposal"/>
-        <result property="wastedisposalunit" column="wastedisposalunit"/>
-        <result property="rawmaterialsinput" column="rawmaterialsinput"/>
-        <result property="rawmaterialsunit" column="rawmaterialsunit"/>
-        <result property="disposeway" column="disposeway"/>
-        <result property="disposename" column="disposename"/>
-        <result property="disposeaddress" column="disposeaddress"/>
-        <result property="transmode" column="transmode"/>
-        <result property="transloadcapacity" column="transloadcapacity"/>
-        <result property="transdistance" column="transdistance"/>
-        <result property="transdistanceunit" column="transdistanceunit"/>
-        <result property="transdatasource" column="transdatasource"/>
-        <result property="activitydatasource" column="activitydatasource"/>
-        <result property="dept" column="dept"/>
-        <result property="person" column="person"/>
-        <result property="phone" column="phone"/>
-        <result property="remake" column="remake"/>
-        <result property="wasteno" column="wasteno"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml
new file mode 100644
index 0000000..e0b9d39
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml
deleted file mode 100644
index 4a9a35d..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity" id="cqcCarbonDistributionMap">
-        <result property="id" column="id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="materialsnamecn" column="materialsnamecn"/>
-        <result property="productweight" column="productweight"/>
-        <result property="productweightunit" column="productweightunit"/>
-        <result property="distributionobject" column="distributionobject"/>
-        <result property="distributionaddress" column="distributionaddress"/>
-        <result property="transmode" column="transmode"/>
-        <result property="transloadcapacity" column="transloadcapacity"/>
-        <result property="transdistance" column="transdistance"/>
-        <result property="transdistanceunit" column="transdistanceunit"/>
-        <result property="transdatasource" column="transdatasource"/>
-        <result property="activitydatasource" column="activitydatasource"/>
-        <result property="dept" column="dept"/>
-        <result property="person" column="person"/>
-        <result property="phone" column="phone"/>
-        <result property="remake" column="remake"/>
-        <result property="disno" column="disno"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml
new file mode 100644
index 0000000..690715c
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonDistribution.mapper.CqcCarbonDistributionMapper">
+
+
+</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml
deleted file mode 100644
index 1c253cc..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity" id="cqcCarbonEnergyMap">
-        <result property="id" column="id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="cateid" column="cateid"/>
-        <result property="useprocedure" column="useprocedure"/>
-        <result property="emissionsource" column="emissionsource"/>
-        <result property="materialsuse" column="materialsuse"/>
-        <result property="energycapacity" column="energycapacity"/>
-        <result property="energycapacityunit" column="energycapacityunit"/>
-        <result property="rawmaterialsinput" column="rawmaterialsinput"/>
-        <result property="rawmaterialsunit" column="rawmaterialsunit"/>
-        <result property="activitydatasource" column="activitydatasource"/>
-        <result property="dept" column="dept"/>
-        <result property="person" column="person"/>
-        <result property="phone" column="phone"/>
-        <result property="remake" column="remake"/>
-        <result property="consumeno" column="consumeno"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml
new file mode 100644
index 0000000..d046813
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonEnergy.mapper.CqcCarbonEnergyMapper">
+
+
+</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml
deleted file mode 100644
index 20d88c9..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity" id="cqcCarbonMakeMap">
-        <result property="id" column="id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="cateid" column="cateid"/>
-        <result property="useplace" column="useplace"/>
-        <result property="emissionsource" column="emissionsource"/>
-        <result property="totalelectricity" column="totalelectricity"/>
-        <result property="totalelectricityunit" column="totalelectricityunit"/>
-        <result property="specificconsumption" column="specificconsumption"/>
-        <result property="specificconsumptionunit" column="specificconsumptionunit"/>
-        <result property="activitydatasource" column="activitydatasource"/>
-        <result property="dept" column="dept"/>
-        <result property="person" column="person"/>
-        <result property="phone" column="phone"/>
-        <result property="remake" column="remake"/>
-        <result property="makeno" column="makeno"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml
new file mode 100644
index 0000000..3a4329d
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonMake.mapper.CqcCarbonMakeMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml
deleted file mode 100644
index 39c14ff..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity" id="cqcCarbonRawMap">
-        <result property="id" column="id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="materialno" column="materialno"/>
-        <result property="cateid" column="cateid"/>
-        <result property="materialsnamecn" column="materialsnamecn"/>
-        <result property="materialsnameen" column="materialsnameen"/>
-        <result property="productionprocesses" column="productionprocesses"/>
-        <result property="materialcomponent" column="materialcomponent"/>
-        <result property="productcapacity" column="productcapacity"/>
-        <result property="productcapacityunit" column="productcapacityunit"/>
-        <result property="rawmaterialsinput" column="rawmaterialsinput"/>
-        <result property="rawmaterialsunit" column="rawmaterialsunit"/>
-        <result property="suppliername" column="suppliername"/>
-        <result property="supplieraddress" column="supplieraddress"/>
-        <result property="transmode" column="transmode"/>
-        <result property="transloadcapacity" column="transloadcapacity"/>
-        <result property="transdistance" column="transdistance"/>
-        <result property="transdistanceunit" column="transdistanceunit"/>
-        <result property="transdatasource" column="transdatasource"/>
-        <result property="activitydatasource" column="activitydatasource"/>
-        <result property="dept" column="dept"/>
-        <result property="person" column="person"/>
-        <result property="phone" column="phone"/>
-        <result property="remake" column="remake"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml
new file mode 100644
index 0000000..4c77db1
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonRaw.mapper.CqcCarbonRawMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml
deleted file mode 100644
index 7302bcf..0000000
--- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper">
-
-    <resultMap type="com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity" id="cqcCarbonReportMap">
-        <result property="deptId" column="dept_id"/>
-        <result property="applyNo" column="apply_no"/>
-        <result property="clientNameCn" column="client_name_cn"/>
-        <result property="clientNameEn" column="client_name_en"/>
-        <result property="clientAddressCn" column="client_address_cn"/>
-        <result property="clientAddressEn" column="client_address_en"/>
-        <result property="clientPostcode" column="client_postcode"/>
-        <result property="clientContactName" column="client_contact_name"/>
-        <result property="clientDepartment" column="client_department"/>
-        <result property="clientPosition" column="client_position"/>
-        <result property="clientPhone" column="client_phone"/>
-        <result property="clientFax" column="client_fax"/>
-        <result property="clientEmail" column="client_email"/>
-        <result property="relationshipWithChecked" column="relationship_with_checked"/>
-        <result property="enterpriseNameCn" column="enterprise_name_cn"/>
-        <result property="enterpriseNameEn" column="enterprise_name_en"/>
-        <result property="enterpriseAddressCn" column="enterprise_address_cn"/>
-        <result property="enterpriseAddressEn" column="enterprise_address_en"/>
-        <result property="enterpriseNature" column="enterprise_nature"/>
-        <result property="offerProduct" column="offer_product"/>
-        <result property="annualProduction" column="annual_production"/>
-        <result property="supplyDataAvailable" column="supply_data_available"/>
-        <result property="companyUrl" column="company_url"/>
-        <result property="transportationDataComplete" column="transportation_data_complete"/>
-        <result property="isUseIso" column="is_use_iso"/>
-        <result property="currentEnergySource" column="current_energy_source"/>
-        <result property="currentEnergyOther" column="current_energy_other"/>
-        <result property="factoryNameCn" column="factory_name_cn"/>
-        <result property="factoryNameEn" column="factory_name_en"/>
-        <result property="factoryAddressCn" column="factory_address_cn"/>
-        <result property="factoryAddressEn" column="factory_address_en"/>
-        <result property="isCarbonCheck" column="is_carbon_check"/>
-        <result property="checkType" column="check_type"/>
-        <result property="expectedCheckLevel" column="expected_check_level"/>
-        <result property="language" column="language"/>
-        <result property="productNameCn" column="product_name_cn"/>
-        <result property="productNameEn" column="product_name_en"/>
-        <result property="productModelCn" column="product_model_cn"/>
-        <result property="productModelEn" column="product_model_en"/>
-        <result property="startDate" column="start_date"/>
-        <result property="endDate" column="end_date"/>
-        <result property="fileReviewDate" column="file_review_date"/>
-        <result property="statementSubmissionDate" column="statement_submission_date"/>
-        <result property="onSiteCheckDate" column="on_site_check_date"/>
-        <result property="certificateReleaseDate" column="certificate_release_date"/>
-        <result property="otherRequirements" column="other_requirements"/>
-        <result property="ghgInventoryPrepared" column="ghg_inventory_prepared"/>
-        <result property="ghgInventoryCoveredPeriod" column="ghg_inventory_covered_period"/>
-        <result property="specialAttention" column="special_attention"/>
-        <result property="processDescription" column="process_description"/>
-        <result property="productInfo" column="product_info"/>
-        <result property="companyInfo" column="company_info"/>
-        <result property="avgPersonNum" column="avg_person_num"/>
-        <result property="avgWorkTim" column="avg_work_tim"/>
-        <result property="measureUnit" column="measure_unit"/>
-        <result property="waitProductionCapacity" column="wait_production_capacity"/>
-        <result property="waitProductionUnit" column="wait_production_unit"/>
-        <result property="pieceWeight" column="piece_weight"/>
-        <result property="pieceWeightUnit" column="piece_weight_unit"/>
-        <result property="fullProductionCapacity" column="full_production_capacity"/>
-        <result property="fullProductionUnit" column="full_production_unit"/>
-        <result property="checkExecutive" column="check_executive"/>
-        <result property="phone" column="phone"/>
-        <result property="email" column="email"/>
-        <result property="id" column="id"/>
-        <result property="tenantCode" column="tenant_code"/>
-        <result property="companyId" column="company_id"/>
-        <result property="creator" column="creator"/>
-        <result property="createDate" column="create_date"/>
-        <result property="updater" column="updater"/>
-        <result property="updateDate" column="update_date"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml
new file mode 100644
index 0000000..6692d43
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.thing.cqc.cqcCarbonReport.mapper.CqcCarbonReportMapper">
+
+</mapper>
\ No newline at end of file