Merge branch 'dev-zza' into dev

This commit is contained in:
Lemon
2025-02-27 16:20:53 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1259,7 +1259,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
equipmentInfo.setNewNationalStandard(1);
equipmentInfo.setVinFlag(1);
equipmentInfo.setEquipmentName(pileSn);
equipmentInfo.setEquipmentApplication(1);
equipmentInfo.setEquipmentApplication(Constants.ONE);
equipmentInfo.setEquipmentInvestment(new BigDecimal("0.0"));
equipmentInfo.setProductSN(pileSn);
equipmentInfo.setOpenDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileDetailInfoVO.getCreateTime()));

View File

@@ -103,7 +103,7 @@ public class EquipmentInfo {
* 9其他
*/
@JSONField(name = "EquipmentApplication")
private Integer equipmentApplication;
private String equipmentApplication;
/**
* 额定功率(单位kW) Y