fixbugs

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceTypeServiceImpl.java

@@ -199,6 +199,7 @@ public class DeviceTypeServiceImpl implements DeviceTypeService {
         for (String manufacturerNameKey:manufacturerNameGroupBy.keySet()){
             List<DeviceTypeDto> manufacturerNameList = manufacturerNameGroupBy.get(manufacturerNameKey);
             TreeDataDto manufacturerNameTreeDataDto = new TreeDataDto();
+            manufacturerNameTreeDataDto.setId(manufacturerNameList.get(0)!=null?manufacturerNameList.get(0).getManufacturerId():null);
             manufacturerNameTreeDataDto.setLabel(manufacturerNameKey);
             manufacturerNameTreeDataDto.setValue(manufacturerNameKey);
             datalist.add(manufacturerNameTreeDataDto);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/assistant/InstallManagerServiceImpl.java

@@ -801,7 +801,7 @@ public class InstallManagerServiceImpl implements InstallManagerService, Initial
 		d.setManufacturerId(dto.getFactoryId()); // 厂商
 		d.setCreateBy(dto.getCreateBy());
 		d.setUpdateBy(dto.getUpdateBy());
-		d.setDateCreate(dto.getDateCreate());
+		//d.setDateCreate(dto.getDateCreate());
 		d.setDateUpdate(dto.getDateUpdate());
 		d.setMetercode(dto.getMetercode());
 		d.setAccountId(dto.getAccountId());