diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java
index 070b24a36..9e5e60ffa 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java
@@ -114,6 +114,6 @@ public class BasicdataCategoryEntity extends TenantEntity {
 	 * 类型
 	 */
 	@ApiModelProperty(value = "类型")
-	private Integer type;
+	private String type;
 
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java
index 97e460ef3..f3e986124 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java
@@ -60,7 +60,7 @@ public class BasicdataCategoryImporter implements ExcelImporter<BasicdataCategor
 				BasicdataCategoryEntity basicdataCategoryEntity = new BasicdataCategoryEntity();
 				basicdataCategoryEntity.setName(item.getName());
 				String dictValue = findDictValue(category, item.getType());
-				basicdataCategoryEntity.setType(dictValue==null?1:Integer.parseInt(dictValue));
+				basicdataCategoryEntity.setType(dictValue==null?"1":dictValue);
 				if(item.getParentCategory()==null){
 					pList.add(basicdataCategoryEntity);
 				}else{
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
index d933fb1e5..a44cace25 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
@@ -405,9 +405,11 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		//对于合同开始时间比对
 		Predicate<Date> predicateContractStartTime = Predicate.isEqual(oldClientEntity.getContractStartTime());
-		boolean contractStartTime = predicateContractStartTime.test(newClientEntity.getContractStartTime());
-		if (!contractStartTime) {
-			content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractStartTime())).append("]变更为-->[").append(sdf.format(oldClientEntity.getContractStartTime())).append("],");
+		if(!Objects.isNull(predicateContractStartTime)){
+			boolean contractStartTime = predicateContractStartTime.test(newClientEntity.getContractStartTime());
+			if (!contractStartTime) {
+				content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractStartTime())).append("]变更为-->[").append(sdf.format(oldClientEntity.getContractStartTime())).append("],");
+			}
 		}
 		//对于合同结束时间比对
 		Predicate<Date> predicateContractEntTime = Predicate.isEqual(oldClientEntity.getContractEntTime());
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index bf78d3827..fb34ed9ff 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -494,6 +494,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 	@Transactional(rollbackFor = Exception.class)
 	public void importUser(List<WarehousingEntryDetailExcel> data, Boolean isCovered) {
 		//分组
+
 		Map<String, List<WarehousingEntryDetailExcel>> collect = data.stream().collect(Collectors.groupingBy(o -> {
 			System.out.println("====<<<<<<<<" + o);
 			if (ObjectUtils.isEmpty(o) || ObjectUtils.isNull(o.getCustomerName()) || ObjectUtils.isNull(o.getCustomerCode())) {