Merge branch 'dev'

zxl

2025-03-14 23b688e436a89845e92d861adb5875e625e90d9f

 business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java

@@ -53,8 +53,7 @@
    private Long unit;

    @ApiModelProperty("年份")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date year;
    private String year;

    @ApiModelProperty("父工程")
    private String parent;