From dbd6d0501649c29ac274a69fc4d92bf34a060efc Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Wed, 14 Aug 2024 08:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E9=98=B6=E6=AE=B5=20?=
 =?UTF-8?q?=E7=A2=B3=E6=8E=92=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java | 36 +++++++++----------
 .../entity/CqcCarbonRawEntity.java            | 36 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

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
index ad39a80..4097b00 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
@@ -24,41 +24,41 @@ public class CqcCarbonRawDTO implements Serializable {
     @Schema(description = "申请唯一编码，关联申请记录表申请唯一编码")
     private String applyNo;
     @Schema(description = "材料编号")
-    private String materialno;
+    private String materialNo;
     @Schema(description = "类别ID")
-    private String cateid;
+    private String cateId;
     @Schema(description = "材料中文名称")
-    private String materialsnamecn;
+    private String materialsNameCn;
     @Schema(description = "材料英文名称及化学名称")
-    private String materialsnameen;
+    private String materialsNameEn;
     @Schema(description = "生成工序")
-    private String productionprocesses;
+    private String productionProcesses;
     @Schema(description = "材料组份名称及比例")
-    private String materialcomponent;
+    private String materialComponent;
     @Schema(description = "盘查期间内生产该产品所使用原料总投入量")
-    private String productcapacity;
+    private String productCapacity;
     @Schema(description = "投入量单位")
-    private String productcapacityunit;
+    private String productCapacityUnit;
     @Schema(description = "功能单位原物料投入量")
-    private String rawmaterialsinput;
+    private String rawMaterialsInput;
     @Schema(description = "原物料投入量单位")
-    private String rawmaterialsunit;
+    private String rawMaterialsUnit;
     @Schema(description = "供货商名称")
-    private String suppliername;
+    private String supplierName;
     @Schema(description = "供货商地址")
-    private String supplieraddress;
+    private String supplierAddress;
     @Schema(description = "运输方式")
-    private String transmode;
+    private String transMode;
     @Schema(description = "运输工具载重量")
-    private String transloadcapacity;
+    private String transLoadCapacity;
     @Schema(description = "运输距离")
-    private String transdistance;
+    private String transDistance;
     @Schema(description = "运输距离单位")
-    private String transdistanceunit;
+    private String transDistanceUnit;
     @Schema(description = "运输数据来源")
-    private String transdatasource;
+    private String transDataSource;
     @Schema(description = "活动数据来源")
-    private String activitydatasource;
+    private String activityDataSource;
     @Schema(description = "部门")
     private String dept;
     @Schema(description = "负责人")
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
index c8bf0b6..0f5c25f 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
@@ -36,75 +36,75 @@ public class CqcCarbonRawEntity implements Serializable {
 	/**
 	 * 材料编号
 	 */
-	private String materialno;
+	private String materialNo;
 	/**
 	 * 类别ID
 	 */
-	private String cateid;
+	private String cateId;
 	/**
 	 * 材料中文名称
 	 */
-	private String materialsnamecn;
+	private String materialsNameCn;
 	/**
 	 * 材料英文名称及化学名称
 	 */
-	private String materialsnameen;
+	private String materialsNameEn;
 	/**
 	 * 生成工序
 	 */
-	private String productionprocesses;
+	private String productionProcesses;
 	/**
 	 * 材料组份名称及比例
 	 */
-	private String materialcomponent;
+	private String materialComponent;
 	/**
 	 * 盘查期间内生产该产品所使用原料总投入量
 	 */
-	private String productcapacity;
+	private String productCapacity;
 	/**
 	 * 投入量单位
 	 */
-	private String productcapacityunit;
+	private String productCapacityUnit;
 	/**
 	 * 功能单位原物料投入量
 	 */
-	private String rawmaterialsinput;
+	private String rawMaterialsInput;
 	/**
 	 * 原物料投入量单位
 	 */
-	private String rawmaterialsunit;
+	private String rawMaterialsUnit;
 	/**
 	 * 供货商名称
 	 */
-	private String suppliername;
+	private String supplierName;
 	/**
 	 * 供货商地址
 	 */
-	private String supplieraddress;
+	private String supplierAddress;
 	/**
 	 * 运输方式
 	 */
-	private String transmode;
+	private String transMode;
 	/**
 	 * 运输工具载重量
 	 */
-	private String transloadcapacity;
+	private String transLoadCapacity;
 	/**
 	 * 运输距离
 	 */
-	private String transdistance;
+	private String transDistance;
 	/**
 	 * 运输距离单位
 	 */
-	private String transdistanceunit;
+	private String transDistanceUnit;
 	/**
 	 * 运输数据来源
 	 */
-	private String transdatasource;
+	private String transDataSource;
 	/**
 	 * 活动数据来源
 	 */
-	private String activitydatasource;
+	private String activityDataSource;
 	/**
 	 * 部门
 	 */